Merge 84646e4451 into 9163caeb0d

CS2-SimpleAdmin/CS2-SimpleAdmin.cs

@@ -11,7 +11,7 @@ using MySqlConnector;
 
 namespace CS2_SimpleAdmin;
 
-[MinimumApiVersion(300)]
+[MinimumApiVersion(286)]
 public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdminConfig>
 {
     internal static CS2_SimpleAdmin Instance { get; private set; } = new();
@@ -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.2b";
+    public override string ModuleVersion => "1.7.2a";
     
     public override void Load(bool hotReload)
     {
@@ -56,6 +56,8 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
 
     public override void OnAllPluginsLoaded(bool hotReload)
     {
+        new ServerManager().CheckHibernationStatus();
+
         AddTimer(3.0f, () => ReloadAdmins(null));
 
         try

CS2-SimpleAdmin/CS2-SimpleAdmin.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.300" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.287" />
     <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="MySqlConnector" Version="2.4.0" />
     <PackageReference Include="Newtonsoft.Json" Version="*" />

CS2-SimpleAdmin/Events.cs

@@ -369,8 +369,6 @@ value.WaitingForKick)
         if (Config.OtherSettings.ReloadAdminsEveryMapChange && ServerLoaded && ServerId != null)
             AddTimer(3.0f, () => ReloadAdmins(null));
 
-        AddTimer(1.0f, () => new ServerManager().CheckHibernationStatus());
-
         // AddTimer(34, () =>
         // {
         //     if (!ServerLoaded)

CS2-SimpleAdmin/Helper.cs

@@ -144,8 +144,8 @@ internal static class Helper
         if (player == null || !player.IsValid || player.IsHLTV)
             return;
         
-        if (player.UserId.HasValue && CS2_SimpleAdmin.PlayersInfo.TryGetValue(player.UserId.Value, out var value))
+        if (player.UserId.HasValue)
-            value.WaitingForKick = true;
+            CS2_SimpleAdmin.PlayersInfo[player.UserId.Value].WaitingForKick = true;
 
         player.CommitSuicide(true, true);
         
@@ -156,16 +156,16 @@ internal static class Helper
                 if (!player.IsValid || player.IsHLTV)
                     return;
                 
-                // Server.ExecuteCommand($"kickid {player.UserId}");
+                Server.ExecuteCommand($"kickid {player.UserId}");
 
-                player.Disconnect(reason);
+                // player.Disconnect(reason); Broken after last update
             });
         }
         else
         {
-            // Server.ExecuteCommand($"kickid {player.UserId}");
+            Server.ExecuteCommand($"kickid {player.UserId}");
 
-            player.Disconnect(reason); 
+            // player.Disconnect(reason); // Broken after last update
         }
         
         if (CS2_SimpleAdmin.UnlockedCommands && reason == NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED)
@@ -189,8 +189,8 @@ internal static class Helper
         if (!player.IsValid || player.IsHLTV)
             return;
 
-        if (player.UserId.HasValue && CS2_SimpleAdmin.PlayersInfo.TryGetValue(player.UserId.Value, out var value))
+        if (player.UserId.HasValue)
-            value.WaitingForKick = true;
+            CS2_SimpleAdmin.PlayersInfo[player.UserId.Value].WaitingForKick = true;
         
         player.CommitSuicide(true, true);
         
@@ -211,15 +211,15 @@ internal static class Helper
                 // 	}
                 // }
                 //
-                // Server.ExecuteCommand($"kickid {player.UserId}");
+                Server.ExecuteCommand($"kickid {player.UserId}");
-                player.Disconnect(reason);
+                // player.Disconnect(reason); // Broken after last update
             });
         }
         else
         {
-            // Server.ExecuteCommand($"kickid {player.UserId}");
+            Server.ExecuteCommand($"kickid {player.UserId}");
 
-            player.Disconnect(reason);
+            // player.Disconnect(reason); // Broken after last update
         }
         
         if (CS2_SimpleAdmin.UnlockedCommands && reason == NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED)

CS2-SimpleAdmin/VERSION

@@ -1 +1 @@
-1.7.2b
+1.7.2a

CS2-SimpleAdminApi/CS2-SimpleAdminApi.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="CounterStrikeSharp.API" Version="1.0.300" />
+      <PackageReference Include="CounterStrikeSharp.API" Version="1.0.287" />
     </ItemGroup>
 
 </Project>