From ca3b8e504630187a55487a8317bf3caffda4e61c Mon Sep 17 00:00:00 2001
From: Kenshin13 <63159154+Kenshiin13@users.noreply.github.com>
Date: Tue, 21 Oct 2025 18:26:23 +0200
Subject: [PATCH] fix(es_extended): remove admin fallback for superadmin group

---
 [core]/es_extended/server/main.lua             | 11 +----------
 [core]/es_extended/server/modules/commands.lua |  6 ++----
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua
index f9f272c2..5f912d30 100644
--- a/[core]/es_extended/server/main.lua
+++ b/[core]/es_extended/server/main.lua
@@ -271,16 +271,7 @@ function loadESXPlayer(identifier, playerId, isNew)
     end
 
     -- Group
-    if result.group then
-        if result.group == "superadmin" then
-            userData.group = "admin"
-            print("[^3WARNING^7] ^5Superadmin^7 detected, setting group to ^5admin^7")
-        else
-            userData.group = result.group
-        end
-    else
-        userData.group = "user"
-    end
+    userData.group = result.group or "user"
 
     -- Loadout
     if not Config.CustomInventory then
diff --git a/[core]/es_extended/server/modules/commands.lua b/[core]/es_extended/server/modules/commands.lua
index 2320e82f..cbbc9e37 100644
--- a/[core]/es_extended/server/modules/commands.lua
+++ b/[core]/es_extended/server/modules/commands.lua
@@ -510,11 +510,9 @@ ESX.RegisterCommand(
         if not args.playerId then
             args.playerId = xPlayer.source
         end
-        if args.group == "superadmin" then
-            args.group = "admin"
-            print("[^3WARNING^7] ^5Superadmin^7 detected, setting group to ^5admin^7")
-        end
+
         args.playerId.setGroup(args.group)
+
         if Config.AdminLogging then
             ESX.DiscordLogFields("UserActions", "/setgroup Triggered!", "pink", {
                 { name = "Player", value = xPlayer and xPlayer.name or "Server Console", inline = true },