Merge 84646e4451 into 8af805632a

CS2-SimpleAdmin/Api/CS2_SimpleAdminApi.cs

@@ -25,14 +25,14 @@ public class CS2_SimpleAdminApi : ICS2_SimpleAdminApi
         return PlayerPenaltyManager.GetAllPlayerPenalties(player.Slot);
     }
     
-    public event Action<PlayerInfo, PlayerInfo?, PenaltyType, string, int, int?, int?>? OnPlayerPenaltied;
+    public event Action<PlayerInfo, PlayerInfo?, PenaltyType, string, int, int?>? OnPlayerPenaltied;
-    public event Action<SteamID, PlayerInfo?, PenaltyType, string, int, int?, int?>? OnPlayerPenaltiedAdded;
+    public event Action<SteamID, PlayerInfo?, PenaltyType, string, int, int?>? OnPlayerPenaltiedAdded;
 
     public void OnPlayerPenaltiedEvent(PlayerInfo player, PlayerInfo? admin, PenaltyType penaltyType, string reason,
-        int duration, int? penaltyId) =>  OnPlayerPenaltied?.Invoke(player, admin, penaltyType, reason, duration, penaltyId, CS2_SimpleAdmin.ServerId);
+        int duration = -1) =>  OnPlayerPenaltied?.Invoke(player, admin, penaltyType, reason, duration, CS2_SimpleAdmin.ServerId);
     
     public void OnPlayerPenaltiedAddedEvent(SteamID player, PlayerInfo? admin, PenaltyType penaltyType, string reason,
-        int duration, int? penaltyId) =>  OnPlayerPenaltiedAdded?.Invoke(player, admin, penaltyType, reason, duration, penaltyId, CS2_SimpleAdmin.ServerId);
+        int duration) =>  OnPlayerPenaltiedAdded?.Invoke(player, admin, penaltyType, reason, duration, CS2_SimpleAdmin.ServerId);
 
     public void IssuePenalty(CCSPlayerController player, CCSPlayerController? admin, PenaltyType penaltyType, string reason, int duration = -1)
     {

CS2-SimpleAdmin/CS2-SimpleAdmin.cs

@@ -19,7 +19,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
     public override string ModuleName => "CS2-SimpleAdmin" + (Helper.IsDebugBuild ? " (DEBUG)" : " (RELEASE)");
     public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)";
     public override string ModuleAuthor => "daffyy & Dliix66";
-    public override string ModuleVersion => "1.7.1a";
+    public override string ModuleVersion => "1.7.0a";
     
     public override void Load(bool hotReload)
     {

CS2-SimpleAdmin/Commands/RegisterCommands.cs

@@ -78,8 +78,7 @@ public static class RegisterCommands
         new CommandMapping("css_respawn", CS2_SimpleAdmin.Instance.OnRespawnCommand),
         new CommandMapping("css_tp", CS2_SimpleAdmin.Instance.OnGotoCommand),
         new CommandMapping("css_bring", CS2_SimpleAdmin.Instance.OnBringCommand),
-        new CommandMapping("css_pluginsmanager", CS2_SimpleAdmin.Instance.OnPluginManagerCommand),
+        new CommandMapping("css_pluginsmanager", CS2_SimpleAdmin.Instance.OnPluginManagerCommand)
-        new CommandMapping("css_adminvoice", CS2_SimpleAdmin.Instance.OnAdminVoiceCommand)
     ];
 
     public static void InitializeCommands()
@@ -161,8 +160,7 @@ public static class RegisterCommands
                 { "css_respawn", new Command { Aliases = ["css_respawn"] } },
                 { "css_tp", new Command { Aliases = ["css_tp", "css_tpto", "css_goto"] } },
                 { "css_bring", new Command { Aliases = ["css_bring", "css_tphere"] } },
-                { "css_pluginsmanager", new Command { Aliases = ["css_pluginsmanager", "css_pluginmanager"] } },
+                { "css_pluginsmanager", new Command { Aliases = ["css_pluginsmanager", "css_pluginmanager"] } }
-                { "css_adminvoice", new Command { Aliases = ["css_adminvoice", "css_listenall"] } }
             }
         };
         

CS2-SimpleAdmin/Commands/basebans.cs

@@ -20,6 +20,8 @@ public partial class CS2_SimpleAdmin
         if (command.ArgCount < 2)
             return;
 
+        var reason = _localizer?["sa_unknown"] ?? "Unknown";
+
         var targets = GetTarget(command);
         if (targets == null) return;
         var playersToTarget = targets.Players.Where(player => player is { IsValid: true, Connected: PlayerConnectedState.PlayerConnected, IsHLTV: false }).ToList();
@@ -29,17 +31,14 @@ public partial class CS2_SimpleAdmin
             return;
         }
         
-        var reason = command.ArgCount >= 3
+        if (command.ArgCount >= 3 && command.GetArg(3).Length > 0)
-            ? string.Join(" ", Enumerable.Range(3, command.ArgCount - 3).Select(command.GetArg))
+            reason = command.GetArg(3);
-            : _localizer?["sa_unknown"] ?? "Unknown";
-
-        var time = Helper.ParsePenaltyTime(command.GetArg(2));
 
         playersToTarget.ForEach(player =>
         {
             if (!caller.CanTarget(player)) return;
             
-            if (time < 0 && caller != null && caller.IsValid && Config.OtherSettings.ShowBanMenuIfNoTime)
+            if (!int.TryParse(command.GetArg(2), out var time) && caller != null && caller.IsValid && Config.OtherSettings.ShowBanMenuIfNoTime)
             {
                 DurationMenu.OpenMenu(caller, $"{_localizer?["sa_ban"] ?? "Ban"}: {player.PlayerName}", player,
                     ManagePlayersMenu.BanMenu);
@@ -61,6 +60,12 @@ public partial class CS2_SimpleAdmin
             ? caller.PlayerName 
             : (_localizer?["sa_console"] ?? "Console");
 
+        // Freeze player pawn if alive
+        if (player.PawnIsAlive)
+        {
+            player.Pawn.Value?.Freeze();
+        }
+
         // Get player and admin information
         var playerInfo = PlayersInfo[player.UserId.Value];
         var adminInfo = caller != null && caller.UserId.HasValue ? PlayersInfo[caller.UserId.Value] : null;
@@ -68,8 +73,7 @@ public partial class CS2_SimpleAdmin
         // Asynchronously handle banning logic
         Task.Run(async () =>
         {
-            int? penaltyId = await BanManager.BanPlayer(playerInfo, adminInfo, reason, time);
+            await BanManager.BanPlayer(playerInfo, adminInfo, reason, time);
-            SimpleAdminApi?.OnPlayerPenaltiedEvent(playerInfo, adminInfo, PenaltyType.Ban, reason, time, penaltyId);
         });
 
         // Update banned players list
@@ -99,7 +103,13 @@ public partial class CS2_SimpleAdmin
         // Schedule a kick timer
         if (player.UserId.HasValue)
         {
-            Helper.KickPlayer(player.UserId.Value, NetworkDisconnectionReason.NETWORK_DISCONNECT_KICKBANADDED, Config.OtherSettings.KickTime);
+            AddTimer(Config.OtherSettings.KickTime, () =>
+            {
+                if (player is { IsValid: true, UserId: not null })
+                {
+                    Helper.KickPlayer(player.UserId.Value, NetworkDisconnectionReason.NETWORK_DISCONNECT_KICKBANADDED);
+                }
+            }, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
         }
 
         // Execute ban command if necessary
@@ -117,6 +127,7 @@ public partial class CS2_SimpleAdmin
         }
         
         Helper.SendDiscordPenaltyMessage(caller, player, reason, time, PenaltyType.Ban, _localizer);
+        SimpleAdminApi?.OnPlayerPenaltiedEvent(playerInfo, adminInfo, PenaltyType.Ban, reason, time);
     }
 
     [RequiresPermissions("@css/ban")]
@@ -133,12 +144,11 @@ public partial class CS2_SimpleAdmin
         }
 
         var steamid = steamId.SteamId64.ToString();
-        var reason = command.ArgCount >= 3
+        var reason = command.ArgCount >= 3 && !string.IsNullOrEmpty(command.GetArg(3))
-            ? string.Join(" ", Enumerable.Range(3, command.ArgCount - 3).Select(command.GetArg))
+            ? command.GetArg(3)
             : _localizer?["sa_unknown"] ?? "Unknown";
 
-        var time = Math.Max(0, Helper.ParsePenaltyTime(command.GetArg(2)));
+        int.TryParse(command.GetArg(2), out var time);
-        
         if (!CheckValidBan(caller, time)) return;
 
         var adminInfo = caller != null && caller.UserId.HasValue
@@ -158,14 +168,10 @@ public partial class CS2_SimpleAdmin
         }
         else
         {
-            if (!caller.CanTarget(new SteamID(steamId.SteamId64)))
-                return;
-            
             // Asynchronous ban operation if player is not online or not found
             Task.Run(async () =>
             {
-                int? penaltyId = await BanManager.AddBanBySteamid(steamid, adminInfo, reason, time);
+                await BanManager.AddBanBySteamid(steamid, adminInfo, reason, time);
-                SimpleAdminApi?.OnPlayerPenaltiedAddedEvent(steamId, adminInfo, PenaltyType.Ban, reason, time, penaltyId);
             });
             
             Helper.SendDiscordPenaltyMessage(caller, steamid, reason, time, PenaltyType.Ban, _localizer);
@@ -177,6 +183,8 @@ public partial class CS2_SimpleAdmin
 
         if (UnlockedCommands)
             Server.ExecuteCommand($"banid 1 {steamId.SteamId3}");
+        
+        SimpleAdminApi?.OnPlayerPenaltiedAddedEvent(steamId, adminInfo, PenaltyType.Ban, reason, time);
     }
 
     [RequiresPermissions("@css/ban")]
@@ -194,12 +202,11 @@ public partial class CS2_SimpleAdmin
             return;
         }
 
-        var reason = command.ArgCount >= 3
+        var reason = command.ArgCount >= 3 && !string.IsNullOrEmpty(command.GetArg(3))
-            ? string.Join(" ", Enumerable.Range(3, command.ArgCount - 3).Select(command.GetArg))
+            ? command.GetArg(3)
             : _localizer?["sa_unknown"] ?? "Unknown";
 
-        var time = Math.Max(0, Helper.ParsePenaltyTime(command.GetArg(2)));
+        int.TryParse(command.GetArg(2), out var time);
-
         if (!CheckValidBan(caller, time)) return;
 
         var adminInfo = caller != null && caller.UserId.HasValue
@@ -263,9 +270,7 @@ public partial class CS2_SimpleAdmin
         }
 
         var pattern = command.GetArg(1);
-        var reason = command.ArgCount >= 2
+        var reason = command.GetArg(2);
-            ? string.Join(" ", Enumerable.Range(2, command.ArgCount - 2).Select(command.GetArg))
-            : _localizer?["sa_unknown"] ?? "Unknown";
 
         Task.Run(async () => await BanManager.UnbanPlayer(pattern, callerSteamId, reason));
 
@@ -284,6 +289,8 @@ public partial class CS2_SimpleAdmin
         if (command.ArgCount < 2)
             return;
 
+        var reason = _localizer?["sa_unknown"] ?? "Unknown";
+
         var targets = GetTarget(command);
         if (targets == null) return;
         var playersToTarget = targets.Players.Where(player => player.IsValid && player.Connected == PlayerConnectedState.PlayerConnected && !player.IsHLTV).ToList();
@@ -295,10 +302,10 @@ public partial class CS2_SimpleAdmin
 
         WarnManager warnManager = new(Database);
 
-        var time = Math.Max(0, Helper.ParsePenaltyTime(command.GetArg(2)));
+        int.TryParse(command.GetArg(2), out var time);
-        var reason = command.ArgCount >= 3
+
-            ? string.Join(" ", Enumerable.Range(3, command.ArgCount - 3).Select(command.GetArg))
+        if (command.ArgCount >= 3 && command.GetArg(3).Length > 0)
-            : _localizer?["sa_unknown"] ?? "Unknown";
+            reason = command.GetArg(3);
 
         playersToTarget.ForEach(player =>
         {
@@ -335,8 +342,7 @@ public partial class CS2_SimpleAdmin
         Task.Run(async () =>
         {
             warnManager ??= new WarnManager(Database);
-            int? penaltyId = await warnManager.WarnPlayer(playerInfo, adminInfo, reason, time);
+            await warnManager.WarnPlayer(playerInfo, adminInfo, reason, time);
-            SimpleAdminApi?.OnPlayerPenaltiedEvent(playerInfo, adminInfo, PenaltyType.Warn, reason, time, penaltyId);
 
             // Check for warn thresholds and execute punish command if applicable
             var totalWarns = await warnManager.GetPlayerWarnsCount(player.SteamID.ToString());
@@ -386,6 +392,7 @@ public partial class CS2_SimpleAdmin
 
         // Send Discord notification for the warning
         Helper.SendDiscordPenaltyMessage(caller, player, reason, time, PenaltyType.Warn, _localizer);
+        SimpleAdminApi?.OnPlayerPenaltiedEvent(playerInfo, adminInfo, PenaltyType.Warn, reason, time);
     }
     
     [RequiresPermissions("@css/kick")]

CS2-SimpleAdmin/Commands/basecommands.cs

@@ -15,7 +15,6 @@ using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System.Globalization;
 using System.Reflection;
-using CounterStrikeSharp.API.ValveConstants.Protobuf;
 using MenuManager;
 
 namespace CS2_SimpleAdmin;
@@ -41,7 +40,7 @@ public partial class CS2_SimpleAdmin
             playersToTarget.ForEach(player =>
             {
                 if (!player.UserId.HasValue) return;
-                if (!caller.CanTarget(player)) return;
+                if (!caller!.CanTarget(player)) return;
 
                 userId = player.UserId.Value;
             });
@@ -141,38 +140,6 @@ public partial class CS2_SimpleAdmin
         });
     }
 
-    [RequiresPermissions("@css/chat")]
-    [CommandHelper(whoCanExecute: CommandUsage.CLIENT_ONLY)]
-    public void OnAdminVoiceCommand(CCSPlayerController? caller, CommandInfo command)
-    {
-        if (caller == null || caller.IsValid == false)
-            return;
-
-        if (command.ArgCount > 1)
-        {
-            if (command.GetArg(2).ToLower().Equals("muteAll"))
-            {
-                foreach (var player in Helper.GetValidPlayers().Where(p => p != caller && !AdminManager.PlayerHasPermissions(new SteamID(p.SteamID), "@css/chat")))
-                {
-                    player.VoiceFlags = VoiceFlags.Muted;
-                }
-            }
-            
-            if (command.GetArg(2).ToLower().Equals("unmuteAll"))
-            {
-                foreach (var player in Helper.GetValidPlayers().Where(p => p != caller))
-                {
-                    if (PlayerPenaltyManager.GetPlayerPenalties(player.Slot, PenaltyType.Mute).Count == 0)
-                        player.VoiceFlags = VoiceFlags.Normal;
-                }
-            }
-
-            return;
-        }
-            
-        caller.VoiceFlags = caller.VoiceFlags == VoiceFlags.All ? VoiceFlags.Normal : VoiceFlags.All;
-    }
-    
     [RequiresPermissions("@css/generic")]
     [CommandHelper(whoCanExecute: CommandUsage.CLIENT_ONLY)]
     public void OnAdminCommand(CCSPlayerController? caller, CommandInfo command)
@@ -225,7 +192,7 @@ public partial class CS2_SimpleAdmin
         var globalAdmin = command.GetArg(4).ToLower().Equals("-g") || command.GetArg(5).ToLower().Equals("-g") ||
                           command.GetArg(6).ToLower().Equals("-g");
         int.TryParse(command.GetArg(4), out var immunity);
-        var time = Math.Max(0, Helper.ParsePenaltyTime(command.GetArg(5)));
+        int.TryParse(command.GetArg(5), out var time);
 
         AddAdmin(caller, steamid, name, flags, immunity, time, globalAdmin, command);
     }
@@ -545,23 +512,6 @@ public partial class CS2_SimpleAdmin
                         ReasonMenu.OpenMenu(caller, PenaltyType.Ban, _localizer["sa_reason"], player, (_, _, reason) =>
                         {
                             caller.ExecuteClientCommandFromServer($"css_addban {player.SteamId.SteamId64} {duration} \"{reason}\"");
-                            
-                            // Determine message keys and arguments based on ban time
-                            var (_, activityMessageKey, _, adminActivityArgs) = duration == 0
-                                ? ("sa_player_ban_message_perm", "sa_admin_ban_message_perm",
-                                    [reason, "CALLER"],
-                                    ["CALLER", player.Name, reason])
-                                : ("sa_player_ban_message_time", "sa_admin_ban_message_time",
-                                    new object[] { reason, duration, "CALLER" },
-                                    new object[] { "CALLER", player.Name, reason, duration });
-
-                            // Display admin activity message if necessary
-                            if (!SilentPlayers.Contains(caller.Slot))
-                            {
-                                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, adminActivityArgs);
-                            }
-                            
-                            MenuApi?.CloseMenu(caller);
                         }));
                 });
                 disconnectedMenuAction?.AddMenuOption(_localizer["sa_mute"], (_, _) =>
@@ -570,23 +520,6 @@ public partial class CS2_SimpleAdmin
                         ReasonMenu.OpenMenu(caller, PenaltyType.Mute, _localizer["sa_reason"], player, (_, _, reason) =>
                         {
                             caller.ExecuteClientCommandFromServer($"css_addmute {player.SteamId.SteamId64} {duration} \"{reason}\"");
-                            
-                            // Determine message keys and arguments based on mute time (permanent or timed)
-                            var (_, activityMessageKey, _, adminActivityArgs) = duration == 0
-                                ? ("sa_player_mute_message_perm", "sa_admin_mute_message_perm",
-                                    [reason, "CALLER"],
-                                    ["CALLER", player.Name, reason])
-                                : ("sa_player_mute_message_time", "sa_admin_mute_message_time",
-                                    new object[] { reason, duration, "CALLER" },
-                                    new object[] { "CALLER", player.Name, reason, duration });
-
-                            // Display admin activity message to other players
-                            if (!SilentPlayers.Contains(caller.Slot))
-                            {
-                                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, adminActivityArgs);
-                            }
-                            
-                            MenuApi?.CloseMenu(caller);
                         }));
                 });
                 disconnectedMenuAction?.AddMenuOption(_localizer["sa_gag"], (_, _) =>
@@ -595,23 +528,6 @@ public partial class CS2_SimpleAdmin
                         ReasonMenu.OpenMenu(caller, PenaltyType.Mute, _localizer["sa_reason"], player, (_, _, reason) =>
                         {
                             caller.ExecuteClientCommandFromServer($"css_addgag {player.SteamId.SteamId64} {duration} \"{reason}\"");
-                            
-                            // Determine message keys and arguments based on gag time (permanent or timed)
-                            var (_, activityMessageKey, _, adminActivityArgs) = duration == 0
-                                ? ("sa_player_gag_message_perm", "sa_admin_gag_message_perm",
-                                    [reason, "CALLER"],
-                                    ["CALLER", player.Name, reason])
-                                : ("sa_player_gag_message_time", "sa_admin_gag_message_time",
-                                    new object[] { reason, duration, "CALLER" },
-                                    new object[] { "CALLER", player.Name, reason, duration});
-
-                            // Display admin activity message to other players
-                            if (!SilentPlayers.Contains(caller.Slot))
-                            {
-                                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, adminActivityArgs);
-                            }
-                            
-                            MenuApi?.CloseMenu(caller);
                         }));
                 });
                 disconnectedMenuAction?.AddMenuOption(_localizer["sa_silence"], (_, _) =>
@@ -620,23 +536,6 @@ public partial class CS2_SimpleAdmin
                         ReasonMenu.OpenMenu(caller, PenaltyType.Mute, _localizer["sa_reason"], player, (_, _, reason) =>
                         {
                             caller.ExecuteClientCommandFromServer($"css_addsilence {player.SteamId.SteamId64} {duration} \"{reason}\"");
-                            
-                            // Determine message keys and arguments based on silence time (permanent or timed)
-                            var (_, activityMessageKey, _, adminActivityArgs) = duration == 0
-                                ? ("sa_player_silence_message_perm", "sa_admin_silence_message_perm",
-                                    [reason, "CALLER"],
-                                    ["CALLER", player.Name, reason])
-                                : ("sa_player_silence_message_time", "sa_admin_silence_message_time",
-                                    new object[] { reason, duration, "CALLER" },
-                                    new object[] { "CALLER", player.Name, reason, duration });
-
-                            // Display admin activity message to other players
-                            if (!SilentPlayers.Contains(caller.Slot))
-                            {
-                                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, adminActivityArgs);
-                            }
-                            
-                            MenuApi?.CloseMenu(caller);
                         }));
                 });
 
@@ -666,7 +565,7 @@ public partial class CS2_SimpleAdmin
         playersToTarget.ForEach(player =>
         {
             if (!player.UserId.HasValue) return;
-            if (!caller.CanTarget(player)) return;
+            if (!caller!.CanTarget(player)) return;
 
             var userId = player.UserId.Value;
 
@@ -716,27 +615,27 @@ public partial class CS2_SimpleAdmin
         {
             if (caller != null)
             {
-                caller.PrintToConsole("--------- PLAYER LIST ---------");
+                caller.PrintToConsole($"--------- PLAYER LIST ---------");
                 playersToTarget.ForEach(player =>
                 {
                     caller.PrintToConsole(
                         $"• [#{player.UserId}] \"{player.PlayerName}\" (IP Address: \"{(AdminManager.PlayerHasPermissions(caller, "@css/showip") ? player.IpAddress?.Split(":")[0] : "Unknown")}\" SteamID64: \"{player.SteamID}\")");
                 });
-                caller.PrintToConsole("--------- END PLAYER LIST ---------");
+                caller.PrintToConsole($"--------- END PLAYER LIST ---------");
             }
             else
             {
-                Server.PrintToConsole("--------- PLAYER LIST ---------");
+                Server.PrintToConsole($"--------- PLAYER LIST ---------");
                 playersToTarget.ForEach(player =>
                 {
                     Server.PrintToConsole($"• [#{player.UserId}] \"{player.PlayerName}\" (IP Address: \"{player.IpAddress?.Split(":")[0]}\" SteamID64: \"{player.SteamID}\")");
                 });
-                Server.PrintToConsole("--------- END PLAYER LIST ---------");
+                Server.PrintToConsole($"--------- END PLAYER LIST ---------");
             }
         }
         else
         {
-            var playersJson = JsonConvert.SerializeObject(playersToTarget.Select(player =>
+            var playersJson = JsonConvert.SerializeObject(playersToTarget.Select((CCSPlayerController player) =>
             {
                 var matchStats = player.ActionTrackingServices?.MatchStats;
 
@@ -770,6 +669,7 @@ public partial class CS2_SimpleAdmin
     public void OnKickCommand(CCSPlayerController? caller, CommandInfo command)
     {
         var callerName = caller == null ? _localizer?["sa_console"] ?? "Console" : caller.PlayerName;
+        var reason = _localizer?["sa_unknown"] ?? "Unknown";
 
         var targets = GetTarget(command);
 
@@ -782,9 +682,8 @@ public partial class CS2_SimpleAdmin
             return;
         }
 
-        var reason = command.ArgCount >= 2
+        if (command.ArgCount >= 2 && command.GetArg(2).Length > 0)
-            ? string.Join(" ", Enumerable.Range(2, command.ArgCount - 2).Select(command.GetArg))
+            reason = command.GetArg(2);
-            : _localizer?["sa_unknown"] ?? "Unknown";
 
         playersToTarget.ForEach(player =>
         {
@@ -811,6 +710,12 @@ public partial class CS2_SimpleAdmin
         var playerInfo = PlayersInfo[player.UserId.Value];
         var adminInfo = caller != null && caller.UserId.HasValue ? PlayersInfo[caller.UserId.Value] : null;
 
+        // Freeze player pawn if alive
+        if (player.PawnIsAlive)
+        {
+            player.Pawn.Value?.Freeze();
+        }
+
         // Determine message keys and arguments for the kick notification
         var (messageKey, activityMessageKey, centerArgs, adminActivityArgs) =
             ("sa_player_kick_message", "sa_admin_kick_message",
@@ -829,7 +734,13 @@ public partial class CS2_SimpleAdmin
         // Schedule the kick for the player
         if (player.UserId.HasValue)
         {
-            Helper.KickPlayer(player.UserId.Value, NetworkDisconnectionReason.NETWORK_DISCONNECT_KICKED, Config.OtherSettings.KickTime);
+            AddTimer(Config.OtherSettings.KickTime, () =>
+            {
+                if (player.IsValid)
+                {
+                    Helper.KickPlayer(player.UserId.Value);
+                }
+            }, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
         }
 
         // Log the command and send Discord notification
@@ -838,7 +749,7 @@ public partial class CS2_SimpleAdmin
         else
             Helper.LogCommand(caller, command);
         
-        SimpleAdminApi?.OnPlayerPenaltiedEvent(playerInfo, adminInfo, PenaltyType.Kick, reason, -1, null);
+        SimpleAdminApi?.OnPlayerPenaltiedEvent(playerInfo, adminInfo, PenaltyType.Kick, reason);
     }
 
     [RequiresPermissions("@css/changemap")]

CS2-SimpleAdmin/Commands/basecomms.cs

@@ -2,7 +2,6 @@ using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Admin;
 using CounterStrikeSharp.API.Modules.Commands;
-using CounterStrikeSharp.API.Modules.Entities;
 using CS2_SimpleAdmin.Managers;
 using CS2_SimpleAdmin.Menus;
 using CS2_SimpleAdminApi;
@@ -18,6 +17,8 @@ public partial class CS2_SimpleAdmin
         if (Database == null) return;
         var callerName = caller == null ? _localizer?["sa_console"] ?? "Console" : caller.PlayerName;
 
+        var reason = _localizer?["sa_unknown"] ?? "Unknown";
+
         var targets = GetTarget(command);
         if (targets == null) return;
         var playersToTarget = targets.Players.Where(player => player is { IsValid: true, IsHLTV: false }).ToList();
@@ -27,16 +28,13 @@ public partial class CS2_SimpleAdmin
             return;
         }
         
-        var reason = command.ArgCount >= 3
+        if (command.ArgCount >= 3 && command.GetArg(3).Length > 0)
-            ? string.Join(" ", Enumerable.Range(3, command.ArgCount - 3).Select(command.GetArg))
+            reason = command.GetArg(3);
-            : _localizer?["sa_unknown"] ?? "Unknown";
-        
-        var time = Helper.ParsePenaltyTime(command.GetArg(2));
 
         playersToTarget.ForEach(player =>
         {
             if (!caller!.CanTarget(player)) return;
-            if (time < 0 && caller != null && caller.IsValid && Config.OtherSettings.ShowBanMenuIfNoTime)
+            if (!int.TryParse(command.GetArg(2), out var time) && caller != null && caller.IsValid && Config.OtherSettings.ShowBanMenuIfNoTime)
             {
                 DurationMenu.OpenMenu(caller, $"{_localizer?["sa_gag"] ?? "Gag"}: {player.PlayerName}", player,
                     ManagePlayersMenu.GagMenu);
@@ -63,8 +61,7 @@ public partial class CS2_SimpleAdmin
         // Asynchronously handle gag logic
         Task.Run(async () =>
         {
-            int? penaltyId = await MuteManager.MutePlayer(playerInfo, adminInfo, reason, time);
+            await MuteManager.MutePlayer(playerInfo, adminInfo, reason, time);
-            SimpleAdminApi?.OnPlayerPenaltiedEvent(playerInfo, adminInfo, PenaltyType.Gag, reason, time, penaltyId);
         });
 
         // Add penalty to the player's penalty manager
@@ -101,6 +98,7 @@ public partial class CS2_SimpleAdmin
         }
 
         Helper.SendDiscordPenaltyMessage(caller, player, reason, time, PenaltyType.Gag, _localizer);
+        SimpleAdminApi?.OnPlayerPenaltiedEvent(playerInfo, adminInfo, PenaltyType.Gag, reason, time);
     }
 
     [RequiresPermissions("@css/chat")]
@@ -123,11 +121,11 @@ public partial class CS2_SimpleAdmin
         }
 
         var steamid = steamId.SteamId64.ToString();
-        var reason = command.ArgCount >= 3
+        var reason = command.ArgCount >= 3 && command.GetArg(3).Length > 0
-            ? string.Join(" ", Enumerable.Range(3, command.ArgCount - 3).Select(command.GetArg))
+            ? command.GetArg(3)
-            : _localizer?["sa_unknown"] ?? "Unknown";
+            : (_localizer?["sa_unknown"] ?? "Unknown");
 
-        var time = Math.Max(0, Helper.ParsePenaltyTime(command.GetArg(2)));
+        int.TryParse(command.GetArg(2), out var time);
         if (!CheckValidMute(caller, time)) return;
 
         // Get player and admin info
@@ -147,14 +145,10 @@ public partial class CS2_SimpleAdmin
         }
         else
         {
-            if (!caller.CanTarget(new SteamID(steamId.SteamId64)))
-                return;
-
             // Asynchronous gag operation for offline players
             Task.Run(async () =>
             {
-                int? penaltyId = await MuteManager.AddMuteBySteamid(steamid, adminInfo, reason, time);
+                await MuteManager.AddMuteBySteamid(steamid, adminInfo, reason, time);
-                SimpleAdminApi?.OnPlayerPenaltiedAddedEvent(steamId, adminInfo, PenaltyType.Gag, reason, time, penaltyId);
             });
 
             Helper.SendDiscordPenaltyMessage(caller, steamid, reason, time, PenaltyType.Gag, _localizer);
@@ -164,6 +158,7 @@ public partial class CS2_SimpleAdmin
 
         // Log the gag command and respond to the command
         Helper.LogCommand(caller, command);
+        SimpleAdminApi?.OnPlayerPenaltiedAddedEvent(steamId, adminInfo, PenaltyType.Gag, reason, time);
     }
 
     [RequiresPermissions("@css/chat")]
@@ -174,9 +169,7 @@ public partial class CS2_SimpleAdmin
 
         var callerSteamId = caller?.SteamID.ToString() ?? _localizer?["sa_console"] ?? "Console";
         var pattern = command.GetArg(1);
-        var reason = command.ArgCount >= 2
+        var reason = command.GetArg(2);
-            ? string.Join(" ", Enumerable.Range(2, command.ArgCount - 2).Select(command.GetArg))
-            : _localizer?["sa_unknown"] ?? "Unknown";
 
         if (pattern.Length <= 1)
         {
@@ -242,6 +235,8 @@ public partial class CS2_SimpleAdmin
         if (Database == null) return;
         var callerName = caller == null ? _localizer?["sa_console"] ?? "Console" : caller.PlayerName;
 
+        var reason = _localizer?["sa_unknown"] ?? "Unknown";
+
         var targets = GetTarget(command);
         if (targets == null) return;
         var playersToTarget = targets.Players.Where(player => player is { IsValid: true, IsHLTV: false }).ToList();
@@ -251,16 +246,13 @@ public partial class CS2_SimpleAdmin
             return;
         }
 
-        var reason = command.ArgCount >= 3
+        if (command.ArgCount >= 3 && command.GetArg(3).Length > 0)
-            ? string.Join(" ", Enumerable.Range(3, command.ArgCount - 3).Select(command.GetArg))
+            reason = command.GetArg(3);
-            : _localizer?["sa_unknown"] ?? "Unknown";
-        
-        var time = Helper.ParsePenaltyTime(command.GetArg(2));
 
         playersToTarget.ForEach(player =>
         {
             if (!caller!.CanTarget(player)) return;
-            if (time < 0 && caller != null && caller.IsValid && Config.OtherSettings.ShowBanMenuIfNoTime)
+            if (!int.TryParse(command.GetArg(2), out var time) && caller != null && caller.IsValid && Config.OtherSettings.ShowBanMenuIfNoTime)
             {
                 DurationMenu.OpenMenu(caller, $"{_localizer?["sa_mute"] ?? "Mute"}: {player.PlayerName}", player,
                     ManagePlayersMenu.MuteMenu);
@@ -290,8 +282,7 @@ public partial class CS2_SimpleAdmin
         // Asynchronously handle mute logic
         Task.Run(async () =>
         {
-            int? penaltyId = await MuteManager.MutePlayer(playerInfo, adminInfo, reason, time, 1);
+            await MuteManager.MutePlayer(playerInfo, adminInfo, reason, time, 1);
-            SimpleAdminApi?.OnPlayerPenaltiedEvent(playerInfo, adminInfo, PenaltyType.Mute, reason, time, penaltyId);
         });
 
         // Add penalty to the player's penalty manager
@@ -328,6 +319,7 @@ public partial class CS2_SimpleAdmin
         }
 
         Helper.SendDiscordPenaltyMessage(caller, player, reason, time, PenaltyType.Mute, _localizer);
+        SimpleAdminApi?.OnPlayerPenaltiedEvent(playerInfo, adminInfo, PenaltyType.Mute, reason, time);
     }
 
     [RequiresPermissions("@css/chat")]
@@ -350,11 +342,11 @@ public partial class CS2_SimpleAdmin
         }
 
         var steamid = steamId.SteamId64.ToString();
-        var reason = command.ArgCount >= 3
+        var reason = command.ArgCount >= 3 && command.GetArg(3).Length > 0
-            ? string.Join(" ", Enumerable.Range(3, command.ArgCount - 3).Select(command.GetArg))
+            ? command.GetArg(3)
-            : _localizer?["sa_unknown"] ?? "Unknown";
+            : (_localizer?["sa_unknown"] ?? "Unknown");
 
-        var time = Math.Max(0, Helper.ParsePenaltyTime(command.GetArg(2)));
+        int.TryParse(command.GetArg(2), out var time);
         if (!CheckValidMute(caller, time)) return;
 
         // Get player and admin info
@@ -374,14 +366,10 @@ public partial class CS2_SimpleAdmin
         }
         else
         {
-            if (!caller.CanTarget(new SteamID(steamId.SteamId64)))
-                return;
-
             // Asynchronous mute operation for offline players
             Task.Run(async () =>
             {
-                int? penaltyId = await MuteManager.AddMuteBySteamid(steamid, adminInfo, reason, time, 1);
+                await MuteManager.AddMuteBySteamid(steamid, adminInfo, reason, time, 1);
-                SimpleAdminApi?.OnPlayerPenaltiedAddedEvent(steamId, adminInfo, PenaltyType.Mute, reason, time, penaltyId);
             });
 
             Helper.SendDiscordPenaltyMessage(caller, steamid, reason, time, PenaltyType.Mute, _localizer);
@@ -391,6 +379,7 @@ public partial class CS2_SimpleAdmin
 
         // Log the mute command and respond to the command
         Helper.LogCommand(caller, command);
+        SimpleAdminApi?.OnPlayerPenaltiedAddedEvent(steamId, adminInfo, PenaltyType.Mute, reason, time);
     }
 
     [RequiresPermissions("@css/chat")]
@@ -401,9 +390,7 @@ public partial class CS2_SimpleAdmin
 
         var callerSteamId = caller?.SteamID.ToString() ?? _localizer?["sa_console"] ?? "Console";
         var pattern = command.GetArg(1);
-        var reason = command.ArgCount >= 2
+        var reason = command.GetArg(2);
-            ? string.Join(" ", Enumerable.Range(2, command.ArgCount - 2).Select(command.GetArg))
-            : _localizer?["sa_unknown"] ?? "Unknown";
 
         if (pattern.Length <= 1)
         {
@@ -471,6 +458,8 @@ public partial class CS2_SimpleAdmin
         if (Database == null) return;
         var callerName = caller == null ? _localizer?["sa_console"] ?? "Console" : caller.PlayerName;
 
+        var reason = _localizer?["sa_unknown"] ?? "Unknown";
+
         var targets = GetTarget(command);
         if (targets == null) return;
         var playersToTarget = targets.Players.Where(player => player is { IsValid: true, IsHLTV: false }).ToList();
@@ -480,16 +469,13 @@ public partial class CS2_SimpleAdmin
             return;
         }
         
-        var reason = command.ArgCount >= 3
+        if (command.ArgCount >= 3 && command.GetArg(3).Length > 0)
-            ? string.Join(" ", Enumerable.Range(3, command.ArgCount - 3).Select(command.GetArg))
+            reason = command.GetArg(3);
-            : _localizer?["sa_unknown"] ?? "Unknown";
-
-        var time = Helper.ParsePenaltyTime(command.GetArg(2));
 
         playersToTarget.ForEach(player =>
         {
             if (!caller!.CanTarget(player)) return;
-            if (time < 0 && caller != null && caller.IsValid && Config.OtherSettings.ShowBanMenuIfNoTime)
+            if (!int.TryParse(command.GetArg(2), out var time) && caller != null && caller.IsValid && Config.OtherSettings.ShowBanMenuIfNoTime)
             {
                 DurationMenu.OpenMenu(caller, $"{_localizer?["sa_silence"] ?? "Silence"}: {player.PlayerName}", player,
                     ManagePlayersMenu.SilenceMenu);
@@ -516,8 +502,7 @@ public partial class CS2_SimpleAdmin
         // Asynchronously handle silence logic
         Task.Run(async () =>
         {
-            int? penaltyId = await MuteManager.MutePlayer(playerInfo, adminInfo, reason, time, 2); // Assuming 2 is the type for silence
+            await MuteManager.MutePlayer(playerInfo, adminInfo, reason, time, 2); // Assuming 2 is the type for silence
-            SimpleAdminApi?.OnPlayerPenaltiedEvent(playerInfo, adminInfo, PenaltyType.Silence, reason, time, penaltyId);
         });
 
         // Add penalty to the player's penalty manager
@@ -555,6 +540,7 @@ public partial class CS2_SimpleAdmin
         }
 
         Helper.SendDiscordPenaltyMessage(caller, player, reason, time, PenaltyType.Silence, _localizer);
+        SimpleAdminApi?.OnPlayerPenaltiedEvent(playerInfo, adminInfo, PenaltyType.Silence, reason, time);
     }
 
     [RequiresPermissions("@css/chat")]
@@ -577,11 +563,11 @@ public partial class CS2_SimpleAdmin
         }
 
         var steamid = steamId.SteamId64.ToString();
-        var reason = command.ArgCount >= 3
+        var reason = command.ArgCount >= 3 && command.GetArg(3).Length > 0
-            ? string.Join(" ", Enumerable.Range(3, command.ArgCount - 3).Select(command.GetArg))
+            ? command.GetArg(3)
-            : _localizer?["sa_unknown"] ?? "Unknown";
+            : (_localizer?["sa_unknown"] ?? "Unknown");
 
-        var time = Math.Max(0, Helper.ParsePenaltyTime(command.GetArg(2)));
+        int.TryParse(command.GetArg(2), out var time);
         if (!CheckValidMute(caller, time)) return;
 
         // Get player and admin info
@@ -601,14 +587,10 @@ public partial class CS2_SimpleAdmin
         }
         else
         {
-            if (!caller.CanTarget(new SteamID(steamId.SteamId64)))
-                return;
-
             // Asynchronous silence operation for offline players
             Task.Run(async () =>
             {
-                int? penaltyId = await MuteManager.AddMuteBySteamid(steamid, adminInfo, reason, time, 2);
+                await MuteManager.AddMuteBySteamid(steamid, adminInfo, reason, time, 2);
-                SimpleAdminApi?.OnPlayerPenaltiedAddedEvent(steamId, adminInfo, PenaltyType.Silence, reason, time, penaltyId);
             });
 
             Helper.SendDiscordPenaltyMessage(caller, steamid, reason, time, PenaltyType.Silence, _localizer);
@@ -618,6 +600,7 @@ public partial class CS2_SimpleAdmin
 
         // Log the silence command and respond to the command
         Helper.LogCommand(caller, command);
+        SimpleAdminApi?.OnPlayerPenaltiedAddedEvent(steamId, adminInfo, PenaltyType.Silence, reason, time);
     }
 
     [RequiresPermissions("@css/chat")]
@@ -628,9 +611,7 @@ public partial class CS2_SimpleAdmin
 
         var callerSteamId = caller?.SteamID.ToString() ?? _localizer?["sa_console"] ?? "Console";
         var pattern = command.GetArg(1);
-        var reason = command.ArgCount >= 2
+        var reason = command.GetArg(2);
-            ? string.Join(" ", Enumerable.Range(2, command.ArgCount - 2).Select(command.GetArg))
-            : _localizer?["sa_unknown"] ?? "Unknown";
 
         if (pattern.Length <= 1)
         {

CS2-SimpleAdmin/Database/Migrations/011_AddRconColumnToServersTable.sql

@@ -1 +0,0 @@
-ALTER TABLE `sa_servers` ADD `rcon_password` varchar(128) NULL AFTER `hostname`;

CS2-SimpleAdmin/Events.cs

@@ -59,7 +59,7 @@ public partial class CS2_SimpleAdmin
         new ServerManager().LoadServerData();
     }
 
-    [GameEventHandler(HookMode.Pre)]
+    [GameEventHandler]
     public HookResult OnClientDisconnect(EventPlayerDisconnect @event, GameEventInfo info)
     {
         var player = @event.Userid;
@@ -103,12 +103,7 @@ public partial class CS2_SimpleAdmin
             GravityPlayers.Remove(player);
             
             if (player.UserId.HasValue)
-            {
-                if (@event.Reason == 149)
-                    info.DontBroadcast = true;
-                
                 PlayersInfo.TryRemove(player.UserId.Value, out _);
-            }
 
             var authorizedSteamId = player.AuthorizedSteamID;
             if (authorizedSteamId == null || !PermissionManager.AdminCache.TryGetValue(authorizedSteamId,
@@ -156,11 +151,7 @@ public partial class CS2_SimpleAdmin
         if (player == null || !player.IsValid || player.IsBot)
             return HookResult.Continue;
         
-        if (player.UserId.HasValue && PlayersInfo.TryGetValue(player.UserId.Value, out PlayerInfo? value) &&
+        new PlayerManager().LoadPlayerData(player);
-value.WaitingForKick)
-            return HookResult.Continue;
-        
-        new PlayerManager().LoadPlayerData(player, true);
 
         return HookResult.Continue;
     }

CS2-SimpleAdmin/Extensions/PlayerExtensions.cs

@@ -36,14 +36,6 @@ public static class PlayerExtensions
                                       AdminManager.GetPlayerImmunity(controller) >= AdminManager.GetPlayerImmunity(target);
     }
 
-    public static bool CanTarget(this CCSPlayerController? controller, SteamID steamId)
-    {
-        if (controller is null) return true;
-
-        return AdminManager.CanPlayerTarget(new SteamID(controller.SteamID), steamId) || 
-               AdminManager.GetPlayerImmunity(controller) >= AdminManager.GetPlayerImmunity(steamId);
-    }
-
     public static void SetSpeed(this CCSPlayerController? controller, float speed)
     {
         var playerPawnValue = controller?.PlayerPawn.Value;

CS2-SimpleAdmin/Helper.cs

@@ -79,11 +79,11 @@ internal static class Helper
         );
     }
 
-    // public static bool IsValidSteamId64(string input)
+    public static bool IsValidSteamId64(string input)
-    // {
+    {
-    //     const string pattern = @"^\d{17}$";
+        const string pattern = @"^\d{17}$";
-    //     return Regex.IsMatch(input, pattern);
+        return Regex.IsMatch(input, pattern);
-    // }
+    }
 
     public static bool ValidateSteamId(string input, out SteamID? steamId)
     {
@@ -137,35 +137,14 @@ internal static class Helper
         }
     }
 
-    public static void KickPlayer(int userId, NetworkDisconnectionReason reason = NetworkDisconnectionReason.NETWORK_DISCONNECT_KICKED, int delay = 0)
+    public static void KickPlayer(int userId, NetworkDisconnectionReason reason = NetworkDisconnectionReason.NETWORK_DISCONNECT_KICKED)
     {
         var player = Utilities.GetPlayerFromUserid(userId);
 
         if (player == null || !player.IsValid || player.IsHLTV)
             return;
 
-        if (player.UserId.HasValue)
-            CS2_SimpleAdmin.PlayersInfo[player.UserId.Value].WaitingForKick = true;
-
-        player.CommitSuicide(true, true);
-        
-        if (delay > 0)
-        {
-            CS2_SimpleAdmin.Instance.AddTimer(delay, () =>
-            {
-                if (!player.IsValid || player.IsHLTV)
-                    return;
-                
         player.Disconnect(reason);
-            });
-        }
-        else
-        {
-            player.Disconnect(reason);
-        }
-        
-        if (CS2_SimpleAdmin.UnlockedCommands && reason == NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED)
-            Server.ExecuteCommand($"banid 1 {new SteamID(player.SteamID).SteamId3}");
 
         // if (!string.IsNullOrEmpty(reason))
         // {
@@ -180,33 +159,9 @@ internal static class Helper
         // Server.ExecuteCommand($"kickid {userId} {reason}");
     }
     
-    public static void KickPlayer(CCSPlayerController player, NetworkDisconnectionReason reason = NetworkDisconnectionReason.NETWORK_DISCONNECT_KICKED, int delay = 0)
+    public static void KickPlayer(CCSPlayerController player, NetworkDisconnectionReason reason = NetworkDisconnectionReason.NETWORK_DISCONNECT_KICKED)
-    {
-        if (!player.IsValid || player.IsHLTV)
-            return;
-
-        if (player.UserId.HasValue)
-            CS2_SimpleAdmin.PlayersInfo[player.UserId.Value].WaitingForKick = true;
-        
-        player.CommitSuicide(true, true);
-        
-        if (delay > 0)
-        {
-            CS2_SimpleAdmin.Instance.AddTimer(delay, () =>
-            {
-                if (!player.IsValid || player.IsHLTV)
-                    return;
-
-                player.Disconnect(reason);
-            });
-        }
-        else
     {
         player.Disconnect(reason);
-        }
-        
-        if (CS2_SimpleAdmin.UnlockedCommands && reason == NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED)
-            Server.ExecuteCommand($"banid 1 {new SteamID(player.SteamID).SteamId3}");
 
         // if (!string.IsNullOrEmpty(reason))
         // {
@@ -221,54 +176,6 @@ internal static class Helper
         // Server.ExecuteCommand($"kickid {userId} {reason}");
     }
 
-    public static int ParsePenaltyTime(string time)
-    {
-        if (string.IsNullOrWhiteSpace(time))
-        {
-            CS2_SimpleAdmin._logger?.LogError("Time string cannot be null or empty.");
-            return -1;
-        }
-
-        var timeUnits = new Dictionary<string, int>
-        {
-            { "m", 1 },            // Minute
-            { "h", 60 },           // Hour
-            { "d", 1440 },         // Day (24 * 60)
-            { "w", 10080 },        // Week (7 * 24 * 60)
-            { "mo", 43200 },        // Month (30 * 24 * 60)
-            { "y", 525600 }         // Year (365 * 24 * 60)
-        };
-
-        
-        // Check if the input is purely numeric (e.g., "10" for 10 minutes)
-        if (int.TryParse(time, out var numericMinutes))
-        {
-            return numericMinutes;
-        }
-        
-        int totalMinutes = 0;
-        
-        var regex = new Regex(@"(\d+)([a-z]+)");
-        var matches = regex.Matches(time);
-
-        foreach (Match match in matches)
-        {
-            var value = int.Parse(match.Groups[1].Value); // Numeric part
-            var unit = match.Groups[2].Value;            // Unit part
-
-            if (timeUnits.TryGetValue(unit, out var minutesPerUnit))
-            {
-                totalMinutes += value * minutesPerUnit;
-            }
-            else
-            {
-                throw new ArgumentException($"Invalid time unit '{unit}' in time string.", nameof(time));
-            }
-        }
-
-        return totalMinutes;
-    }
-
     public static void PrintToCenterAll(string message)
     {
         Utilities.GetPlayers().Where(p => p is { IsValid: true, IsBot: false, IsHLTV: false }).ToList().ForEach(controller =>
@@ -725,28 +632,28 @@ internal static class Helper
                 commandString]));
     }
 
-    public static IMenu? CreateMenu(string title, Action<CCSPlayerController>? backAction = null)
+    public static IMenu? CreateMenu(string title)
     {
         var menuType = CS2_SimpleAdmin.Instance.Config.MenuConfigs.MenuType.ToLower();
         
         var menu = menuType switch
         {
             _ when menuType.Equals("selectable", StringComparison.CurrentCultureIgnoreCase) =>
-                CS2_SimpleAdmin.MenuApi?.GetMenu(title),
+                CS2_SimpleAdmin.MenuApi?.NewMenu(title),
 
             _ when menuType.Equals("dynamic", StringComparison.CurrentCultureIgnoreCase) =>
-                CS2_SimpleAdmin.MenuApi?.GetMenuForcetype(title, MenuType.ButtonMenu),
+                CS2_SimpleAdmin.MenuApi?.NewMenuForcetype(title, MenuType.ButtonMenu),
 
             _ when menuType.Equals("center", StringComparison.CurrentCultureIgnoreCase) =>
-                CS2_SimpleAdmin.MenuApi?.GetMenuForcetype(title, MenuType.CenterMenu),
+                CS2_SimpleAdmin.MenuApi?.NewMenuForcetype(title, MenuType.CenterMenu),
 
             _ when menuType.Equals("chat", StringComparison.CurrentCultureIgnoreCase) =>
-                CS2_SimpleAdmin.MenuApi?.GetMenuForcetype(title, MenuType.ChatMenu),
+                CS2_SimpleAdmin.MenuApi?.NewMenuForcetype(title, MenuType.ChatMenu),
 
             _ when menuType.Equals("console", StringComparison.CurrentCultureIgnoreCase) =>
-                CS2_SimpleAdmin.MenuApi?.GetMenuForcetype(title, MenuType.ConsoleMenu),
+                CS2_SimpleAdmin.MenuApi?.NewMenuForcetype(title, MenuType.ConsoleMenu),
 
-            _ => CS2_SimpleAdmin.MenuApi?.GetMenu(title)
+            _ => CS2_SimpleAdmin.MenuApi?.NewMenu(title)
         };
 
         return menu;

CS2-SimpleAdmin/Managers/BanManager.cs

@@ -10,9 +10,9 @@ namespace CS2_SimpleAdmin.Managers;
 
 internal class BanManager(Database.Database? database)
 {
-    public async Task<int?> BanPlayer(PlayerInfo player, PlayerInfo? issuer, string reason, int time = 0)
+    public async Task BanPlayer(PlayerInfo player, PlayerInfo? issuer, string reason, int time = 0)
     {
-        if (database == null) return null;
+        if (database == null) return;
         
         DateTime now = Time.ActualDateTime();
         DateTime futureTime = now.AddMinutes(time);
@@ -20,16 +20,11 @@ internal class BanManager(Database.Database? database)
         await using MySqlConnection connection = await database.GetConnectionAsync();
         try
         {
-            const string sql = """
+            const string sql =
+                "INSERT INTO `sa_bans` (`player_steamid`, `player_name`, `player_ip`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) " +
+                               "VALUES (@playerSteamid, @playerName, @playerIp, @adminSteamid, @adminName, @banReason, @duration, @ends, @created, @serverid)";
 
-                                           INSERT INTO `sa_bans` 
+            await connection.ExecuteAsync(sql, new
-                                           (`player_steamid`, `player_name`, `player_ip`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) 
-                                           VALUES 
-                                           (@playerSteamid, @playerName, @playerIp, @adminSteamid, @adminName, @banReason, @duration, @ends, @created, @serverid);
-                                           SELECT LAST_INSERT_ID();
-                               """;
-
-            var banId = await connection.ExecuteScalarAsync<int?>(sql, new
             {
                 playerSteamid = player.SteamId.SteamId64.ToString(),
                 playerName = player.Name,
@@ -42,19 +37,15 @@ internal class BanManager(Database.Database? database)
                 created = now,
                 serverid = CS2_SimpleAdmin.ServerId
             });
-
-            return banId;
-        }
-        catch
-        {
-            return null;
         }
+        catch { }
     }
 
-    public async Task<int?> AddBanBySteamid(string playerSteamId, PlayerInfo? issuer, string reason, int time = 0)
+    public async Task AddBanBySteamid(string playerSteamId, PlayerInfo? issuer, string reason, int time = 0)
     {
-        if (database == null) return null;
+        if (database == null) return;
-        if (string.IsNullOrEmpty(playerSteamId)) return null;
+
+        if (string.IsNullOrEmpty(playerSteamId)) return;
 
         DateTime now = Time.ActualDateTime();
         DateTime futureTime = now.AddMinutes(time);
@@ -63,16 +54,10 @@ internal class BanManager(Database.Database? database)
         {
             await using MySqlConnection connection = await database.GetConnectionAsync();
 
-            const string sql = """
+            var sql = "INSERT INTO `sa_bans` (`player_steamid`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) " +
+                "VALUES (@playerSteamid, @adminSteamid, @adminName, @banReason, @duration, @ends, @created, @serverid)";
 
-                                           INSERT INTO `sa_bans` 
+            await connection.ExecuteAsync(sql, new
-                                           (`player_steamid`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) 
-                                           VALUES 
-                                           (@playerSteamid, @adminSteamid, @adminName, @banReason, @duration, @ends, @created, @serverid);
-                                           SELECT LAST_INSERT_ID();
-                               """;
-
-            var banId = await connection.ExecuteScalarAsync<int?>(sql, new
             {
                 playerSteamid = playerSteamId,
                 adminSteamid = issuer?.SteamId.SteamId64.ToString() ?? CS2_SimpleAdmin._localizer?["sa_console"] ?? "Console",
@@ -83,13 +68,8 @@ internal class BanManager(Database.Database? database)
                 created = now,
                 serverid = CS2_SimpleAdmin.ServerId
             });
-            
-            return banId;
-        }
-        catch (Exception)
-        {
-            return null;
         }
+        catch { }
     }
 
     public async Task AddBanByIp(string playerIp, PlayerInfo? issuer, string reason, int time = 0)
@@ -403,7 +383,7 @@ internal class BanManager(Database.Database? database)
             foreach (var player in filteredPlayers.Where(player => bannedSteamIds.Contains(player.SteamID) ||
                                                                    (checkIpBans && bannedIps.Contains(player.IpAddress ?? ""))))
             {
-                if (!player.UserId.HasValue || CS2_SimpleAdmin.PlayersInfo[player.UserId.Value].WaitingForKick) continue;
+                if (!player.UserId.HasValue) continue;
 
                 await Server.NextFrameAsync(() =>
                 {

CS2-SimpleAdmin/Managers/MuteManager.cs

@@ -6,9 +6,9 @@ namespace CS2_SimpleAdmin.Managers;
 
 internal class MuteManager(Database.Database? database)
 {
-    public async Task<int?> MutePlayer(PlayerInfo player, PlayerInfo? issuer, string reason, int time = 0, int type = 0)
+    public async Task MutePlayer(PlayerInfo player, PlayerInfo? issuer, string reason, int time = 0, int type = 0)
     {
-        if (database == null) return null;
+        if (database == null) return;
 
         var now = Time.ActualDateTime();
         var futureTime = now.AddMinutes(time);
@@ -23,16 +23,11 @@ internal class MuteManager(Database.Database? database)
         try
         {
             await using var connection = await database.GetConnectionAsync();
-            const string sql = """
+            const string sql =
+                "INSERT INTO `sa_mutes` (`player_steamid`, `player_name`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `type`, `server_id`) " +
+                "VALUES (@playerSteamid, @playerName, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @type, @serverid)";
 
-                                               INSERT INTO `sa_mutes` 
+            await connection.ExecuteAsync(sql, new
-                                               (`player_steamid`, `player_name`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `type`, `server_id`) 
-                                               VALUES 
-                                               (@playerSteamid, @playerName, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @type, @serverid);
-                                               SELECT LAST_INSERT_ID();
-                               """;
-
-            var muteId = await connection.ExecuteScalarAsync<int?>(sql, new
             {
                 playerSteamid = player.SteamId.SteamId64.ToString(),
                 playerName = player.Name,
@@ -45,20 +40,19 @@ internal class MuteManager(Database.Database? database)
                 type = muteType,
                 serverid = CS2_SimpleAdmin.ServerId
             });
-
-            return muteId;
         }
         catch (Exception ex)
         {
             CS2_SimpleAdmin._logger?.LogError(ex.Message);
-            return null;
+        };
-        }
     }
 
-    public async Task<int?> AddMuteBySteamid(string playerSteamId, PlayerInfo? issuer, string reason, int time = 0, int type = 0)
+    public async Task AddMuteBySteamid(string playerSteamId, PlayerInfo? issuer, string reason, int time = 0, int type = 0)
     {
-        if (database == null) return null;
+        if (database == null) return;
-        if (string.IsNullOrEmpty(playerSteamId)) return null;
+
+        if (string.IsNullOrEmpty(playerSteamId)) return;
+
 
         var now = Time.ActualDateTime();
         var futureTime = now.AddMinutes(time);
@@ -73,16 +67,10 @@ internal class MuteManager(Database.Database? database)
         try
         {
             await using var connection = await database.GetConnectionAsync();
-            const string sql = """
+            const string sql = "INSERT INTO `sa_mutes` (`player_steamid`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `type`, `server_id`) " +
+                               "VALUES (@playerSteamid, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @type, @serverid)";
 
-                                               INSERT INTO `sa_mutes` 
+            await connection.ExecuteAsync(sql, new
-                                               (`player_steamid`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `type`, `server_id`) 
-                                               VALUES 
-                                               (@playerSteamid, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @type, @serverid);
-                                               SELECT LAST_INSERT_ID();
-                               """;
-
-            var muteId = await connection.ExecuteScalarAsync<int?>(sql, new
             {
                 playerSteamid = playerSteamId,
                 adminSteamid = issuer?.SteamId.SteamId64.ToString() ?? CS2_SimpleAdmin._localizer?["sa_console"] ?? "Console",
@@ -94,13 +82,8 @@ internal class MuteManager(Database.Database? database)
                 type = muteType,
                 serverid = CS2_SimpleAdmin.ServerId
             });
-
-            return muteId;
-        }
-        catch
-        {
-            return null;
         }
+        catch { };
     }
 
     public async Task<List<dynamic>> IsPlayerMuted(string steamId)

CS2-SimpleAdmin/Managers/PlayerManager.cs

@@ -14,7 +14,7 @@ public class PlayerManager
 {
     private readonly CS2_SimpleAdminConfig _config = CS2_SimpleAdmin.Instance.Config;
 
-    public void LoadPlayerData(CCSPlayerController player, bool fullConnect = false)
+    public void LoadPlayerData(CCSPlayerController player)
     {
         if (player.IsBot || string.IsNullOrEmpty(player.IpAddress) || player.IpAddress.Contains("127.0.0.1"))
             return;
@@ -125,14 +125,15 @@ public class PlayerManager
 
                         if (victim == null || !victim.UserId.HasValue) return;
                         
+                        if (CS2_SimpleAdmin.UnlockedCommands)
+                            Server.ExecuteCommand($"banid 1 {userId}");
+
                         Helper.KickPlayer(userId, NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED);
                     });
 
                     return;
                 }
 
-                if (fullConnect)
-                {
                 var warns = await CS2_SimpleAdmin.Instance.WarnManager.GetPlayerWarns(CS2_SimpleAdmin.PlayersInfo[userId], false);
                 var (totalMutes, totalGags, totalSilences) =
                     await CS2_SimpleAdmin.Instance.MuteManager.GetPlayerMutes(CS2_SimpleAdmin.PlayersInfo[userId]);
@@ -183,9 +184,8 @@ public class PlayerManager
                         }
                     }
                 }
-                }
 
-                if (CS2_SimpleAdmin.Instance.Config.OtherSettings.NotifyPenaltiesToAdminOnConnect && fullConnect)
+                if (CS2_SimpleAdmin.Instance.Config.OtherSettings.NotifyPenaltiesToAdminOnConnect)
                 {
                     await Server.NextFrameAsync(() =>
                     {

CS2-SimpleAdmin/Managers/ServerManager.cs

@@ -38,7 +38,6 @@ public class ServerManager
 
             var address = $"{ipAddress}:{ConVar.Find("hostport")?.GetPrimitiveValue<int>()}";
             var hostname = ConVar.Find("hostname")!.StringValue;
-            var rconPassword = ConVar.Find("rcon_password")!.StringValue;
             CS2_SimpleAdmin.IpAddress = address;
             
             CS2_SimpleAdmin._logger?.LogInformation("Loaded server with ip {ip}", ipAddress);
@@ -48,28 +47,27 @@ public class ServerManager
                 try
                 {
                     await using var connection = await CS2_SimpleAdmin.Database.GetConnectionAsync();
-                    
+                    var addressExists = await connection.ExecuteScalarAsync<bool>(
-                    int? serverId = await connection.ExecuteScalarAsync<int?>(
+                        "SELECT COUNT(*) FROM sa_servers WHERE address = @address",
-                        "SELECT id FROM sa_servers WHERE address = @address",
                         new { address });
 
-                    if (serverId == null)
+                    if (!addressExists)
                     {
                         await connection.ExecuteAsync(
-                            "INSERT INTO sa_servers (address, hostname, rcon_password) VALUES (@address, @hostname, @rconPassword)",
+                            "INSERT INTO sa_servers (address, hostname) VALUES (@address, @hostname)",
-                            new { address, hostname, rconPassword });
+                            new { address, hostname });
-
-                        serverId = await connection.ExecuteScalarAsync<int>(
-                            "SELECT id FROM sa_servers WHERE address = @address",
-                            new { address });
                     }
                     else
                     {
                         await connection.ExecuteAsync(
-                            "UPDATE sa_servers SET hostname = @hostname, rcon_password = @rconPassword WHERE address = @address",
+                            "UPDATE `sa_servers` SET `hostname` = @hostname WHERE `address` = @address",
-                            new { address, hostname, rconPassword });
+                            new { address, hostname });
                     }
 
+                    int? serverId = await connection.ExecuteScalarAsync<int>(
+                        "SELECT `id` FROM `sa_servers` WHERE `address` = @address",
+                        new { address });
+
                     CS2_SimpleAdmin.ServerId = serverId;
 
                     if (CS2_SimpleAdmin.ServerId != null)

CS2-SimpleAdmin/Managers/WarnManager.cs

@@ -6,9 +6,9 @@ namespace CS2_SimpleAdmin.Managers;
 
 internal class WarnManager(Database.Database? database)
 {
-    public async Task<int?> WarnPlayer(PlayerInfo player, PlayerInfo? issuer, string reason, int time = 0)
+    public async Task WarnPlayer(PlayerInfo player, PlayerInfo? issuer, string reason, int time = 0)
     {
-        if (database == null) return null;
+        if (database == null) return;
 
         var now = Time.ActualDateTime();
         var futureTime = now.AddMinutes(time);
@@ -16,16 +16,11 @@ internal class WarnManager(Database.Database? database)
         try
         {
             await using var connection = await database.GetConnectionAsync();
-            const string sql = """
+            const string sql =
+                "INSERT INTO `sa_warns` (`player_steamid`, `player_name`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) " +
+                               "VALUES (@playerSteamid, @playerName, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @serverid)";
 
-                                               INSERT INTO `sa_warns` 
+            await connection.ExecuteAsync(sql, new
-                                               (`player_steamid`, `player_name`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) 
-                                               VALUES 
-                                               (@playerSteamid, @playerName, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @serverid);
-                                               SELECT LAST_INSERT_ID();
-                               """;
-
-            var warnId = await connection.ExecuteScalarAsync<int?>(sql, new
             {
                 playerSteamid = player.SteamId.SteamId64.ToString(),
                 playerName = player.Name,
@@ -37,19 +32,14 @@ internal class WarnManager(Database.Database? database)
                 created = now,
                 serverid = CS2_SimpleAdmin.ServerId
             });
-
-            return warnId;
-        }
-        catch
-        {
-            return null;
         }
+        catch { };
     }
 
-    public async Task<int?> AddWarnBySteamid(string playerSteamId, PlayerInfo? issuer, string reason, int time = 0)
+    public async Task AddWarnBySteamid(string playerSteamId, PlayerInfo? issuer, string reason, int time = 0)
     {
-        if (database == null) return null;
+        if (database == null) return;
-        if (string.IsNullOrEmpty(playerSteamId)) return null;
+        if (string.IsNullOrEmpty(playerSteamId)) return;
 
         var now = Time.ActualDateTime();
         var futureTime = now.AddMinutes(time);
@@ -57,16 +47,10 @@ internal class WarnManager(Database.Database? database)
         try
         {
             await using var connection = await database.GetConnectionAsync();
-            const string sql = """
+            const string sql = "INSERT INTO `sa_warns` (`player_steamid`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) " +
+                               "VALUES (@playerSteamid, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @serverid)";
 
-                                               INSERT INTO `sa_warns` 
+            await connection.ExecuteAsync(sql, new
-                                               (`player_steamid`, `admin_steamid`, `admin_name`, `reason`, `duration`, `ends`, `created`, `server_id`) 
-                                               VALUES 
-                                               (@playerSteamid, @adminSteamid, @adminName, @muteReason, @duration, @ends, @created, @serverid);
-                                               SELECT LAST_INSERT_ID();
-                               """;
-
-            var warnId = await connection.ExecuteScalarAsync<int?>(sql, new
             {
                 playerSteamid = playerSteamId,
                 adminSteamid = issuer?.SteamId.ToString() ?? CS2_SimpleAdmin._localizer?["sa_console"] ?? "Console",
@@ -77,13 +61,8 @@ internal class WarnManager(Database.Database? database)
                 created = now,
                 serverid = CS2_SimpleAdmin.ServerId
             });
-
-            return warnId;
-        }
-        catch
-        {
-            return null;
         }
+        catch { };
     }
 
     public async Task<List<dynamic>> GetPlayerWarns(PlayerInfo player, bool active = true)

CS2-SimpleAdmin/Menus/AdminMenu.cs

@@ -6,9 +6,9 @@ namespace CS2_SimpleAdmin.Menus;
 
 public static class AdminMenu
 {
-    public static IMenu? CreateMenu(string title, Action<CCSPlayerController>? backAction = null)
+    public static IMenu? CreateMenu(string title)
     {
-        return Helper.CreateMenu(title, backAction);
+        return Helper.CreateMenu(title);
         // return CS2_SimpleAdmin.Instance.Config.UseChatMenu ? new ChatMenu(title) : new CenterHtmlMenu(title, CS2_SimpleAdmin.Instance);
     }
 

CS2-SimpleAdmin/VERSION

@@ -1 +1 @@
-1.7.1a
+1.7.0a

CS2-SimpleAdminApi/ICS2-SimpleAdminApi.cs

@@ -17,8 +17,8 @@ public interface ICS2_SimpleAdminApi
 
     public Dictionary<PenaltyType, List<(DateTime EndDateTime, int Duration, bool Passed)>> GetPlayerMuteStatus(CCSPlayerController player);
 
-    public event Action<PlayerInfo, PlayerInfo?, PenaltyType, string, int, int?, int?>? OnPlayerPenaltied;
+    public event Action<PlayerInfo, PlayerInfo?, PenaltyType, string, int, int?>? OnPlayerPenaltied;
-    public event Action<SteamID, PlayerInfo?, PenaltyType, string, int, int?, int?>? OnPlayerPenaltiedAdded;
+    public event Action<SteamID, PlayerInfo?, PenaltyType, string, int, int?>? OnPlayerPenaltiedAdded;
     
     public void IssuePenalty(CCSPlayerController player, CCSPlayerController? admin, PenaltyType penaltyType, string reason, int duration = -1);
     public void LogCommand(CCSPlayerController? caller, string command);

CS2-SimpleAdminApi/PlayerInfo.cs

@@ -25,7 +25,6 @@ public class PlayerInfo(
     public int TotalGags { get; set; } = totalGags;
     public int TotalSilences { get; set; } = totalSilences;
     public int TotalWarns { get; set; } = totalWarns;
-    public bool WaitingForKick { get; set; } = false;
     public DiePosition? DiePosition { get; set; }
 }
 

Modules/CS2-SimpleAdmin_ExampleModule/CS2-SimpleAdmin_ExampleModule.cs

@@ -70,7 +70,7 @@ public class CS2_SimpleAdmin_ExampleModule: BasePlugin
     }
 
     private void OnPlayerPenaltied(PlayerInfo player, PlayerInfo? admin, PenaltyType penaltyType,
-        string reason, int duration, int? penaltyId, int? serverId)
+        string reason, int duration, int? serverId)
     {
         if (penaltyType == PenaltyType.Ban)
         {
@@ -82,7 +82,6 @@ public class CS2_SimpleAdmin_ExampleModule: BasePlugin
             case PenaltyType.Ban:
             {
                 Logger.LogInformation("Ban issued");
-                Logger.LogInformation($"Id = {penaltyId}");
                 break;
             }
             case PenaltyType.Kick:
@@ -93,7 +92,6 @@ public class CS2_SimpleAdmin_ExampleModule: BasePlugin
             case PenaltyType.Gag:
             {
                 Logger.LogInformation("Gag issued");
-                Logger.LogInformation($"Id = {penaltyId}");
                 break;
             }
             case PenaltyType.Mute:
@@ -122,14 +120,13 @@ public class CS2_SimpleAdmin_ExampleModule: BasePlugin
     }
     
     private void OnPlayerPenaltiedAdded(SteamID steamId, PlayerInfo? admin, PenaltyType penaltyType,
-        string reason, int duration, int? penaltyId, int? serverId)
+        string reason, int duration, int? serverId)
     {
         switch (penaltyType)
         {
             case PenaltyType.Ban:
             {
                 Logger.LogInformation("Ban added");
-                Logger.LogInformation($"Id = {penaltyId}");
                 break;
             }
             case PenaltyType.Kick:
@@ -140,7 +137,6 @@ public class CS2_SimpleAdmin_ExampleModule: BasePlugin
             case PenaltyType.Gag:
             {
                 Logger.LogInformation("Gag added");
-                Logger.LogInformation($"Id = {penaltyId}");
                 break;
             }
             case PenaltyType.Mute: