From df0d0a8160241aa0ed254f9c5ce41492f7e75817 Mon Sep 17 00:00:00 2001
From: Andyyy7666 <86536434+Andyyy7666@users.noreply.github.com>
Date: Mon, 16 Mar 2026 05:45:49 +0100
Subject: [PATCH] fix(server/player): updating admin & group roles on character
 activate

---
 server/player.lua | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/server/player.lua b/server/player.lua
index 0f36a26..0c1d757 100644
--- a/server/player.lua
+++ b/server/player.lua
@@ -340,17 +340,36 @@ local function createCharacterTable(info)
         end
 
         local roles = self.discord.roles
-        if roles then            
+        if roles then
+            local hasAdmin = false
             for i=1, #Config.adminDiscordRoles do
                 local role = Config.adminDiscordRoles[i]
                 if lib.table.contains(roles, role) then
-                    self.addGroup("admin")
+                    hasAdmin = true
+                    break
                 end
             end
+
+            if hasAdmin then
+                self.addGroup("admin")
+            elseif self.groups["admin"] then
+                self.removeGroup("admin")
+            end
             
-            for group, role in pairs(Config.groupRoles) do
-                if lib.table.contains(roles, role) then
+            local function hasRole(groupRoles)
+                for i=1, #groupRoles do
+                    local role = groupRoles[i]
+                    if lib.table.contains(roles, role) then
+                        return true
+                    end
+                end
+            end
+
+            for group, groupRoles in pairs(Config.groupRoles) do
+                if hasRole(groupRoles) then
                     self.addGroup(group)
+                elseif self.groups[group] then
+                    self.removeGroup(group)
                 end
             end
         end