diff --git a/CS2-SimpleAdmin/CS2-SimpleAdmin.cs b/CS2-SimpleAdmin/CS2-SimpleAdmin.cs index 2ca0e84..cc523d5 100644 --- a/CS2-SimpleAdmin/CS2-SimpleAdmin.cs +++ b/CS2-SimpleAdmin/CS2-SimpleAdmin.cs @@ -11,7 +11,7 @@ using MySqlConnector; namespace CS2_SimpleAdmin; -[MinimumApiVersion(286)] +[MinimumApiVersion(300)] public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig { internal static CS2_SimpleAdmin Instance { get; private set; } = new(); @@ -19,7 +19,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig "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.2a"; + public override string ModuleVersion => "1.7.2b"; public override void Load(bool hotReload) { @@ -58,8 +58,6 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig ReloadAdmins(null)); try diff --git a/CS2-SimpleAdmin/CS2-SimpleAdmin.csproj b/CS2-SimpleAdmin/CS2-SimpleAdmin.csproj index 58512e8..af4e19d 100644 --- a/CS2-SimpleAdmin/CS2-SimpleAdmin.csproj +++ b/CS2-SimpleAdmin/CS2-SimpleAdmin.csproj @@ -10,7 +10,7 @@ - + diff --git a/CS2-SimpleAdmin/Events.cs b/CS2-SimpleAdmin/Events.cs index 5f35283..1f2c847 100644 --- a/CS2-SimpleAdmin/Events.cs +++ b/CS2-SimpleAdmin/Events.cs @@ -396,6 +396,8 @@ value.WaitingForKick) if (Config.OtherSettings.ReloadAdminsEveryMapChange && ServerLoaded && ServerId != null) AddTimer(3.0f, () => ReloadAdmins(null)); + AddTimer(1.0f, () => new ServerManager().CheckHibernationStatus()); + // AddTimer(34, () => // { // if (!ServerLoaded) diff --git a/CS2-SimpleAdmin/Helper.cs b/CS2-SimpleAdmin/Helper.cs index 0f344cc..0539e4e 100644 --- a/CS2-SimpleAdmin/Helper.cs +++ b/CS2-SimpleAdmin/Helper.cs @@ -171,8 +171,8 @@ internal static class Helper if (player == null || !player.IsValid || player.IsHLTV) return; - if (player.UserId.HasValue) - CS2_SimpleAdmin.PlayersInfo[player.UserId.Value].WaitingForKick = true; + if (player.UserId.HasValue && CS2_SimpleAdmin.PlayersInfo.TryGetValue(player.UserId.Value, out var value)) + value.WaitingForKick = true; player.CommitSuicide(true, true); @@ -183,16 +183,16 @@ internal static class Helper if (!player.IsValid || player.IsHLTV) return; - Server.ExecuteCommand($"kickid {player.UserId}"); + // Server.ExecuteCommand($"kickid {player.UserId}"); - // player.Disconnect(reason); Broken after last update + player.Disconnect(reason); }); } else { - Server.ExecuteCommand($"kickid {player.UserId}"); + // Server.ExecuteCommand($"kickid {player.UserId}"); - // player.Disconnect(reason); // Broken after last update + player.Disconnect(reason); } if (CS2_SimpleAdmin.UnlockedCommands && reason == NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED) @@ -216,8 +216,8 @@ internal static class Helper if (!player.IsValid || player.IsHLTV) return; - if (player.UserId.HasValue) - CS2_SimpleAdmin.PlayersInfo[player.UserId.Value].WaitingForKick = true; + if (player.UserId.HasValue && CS2_SimpleAdmin.PlayersInfo.TryGetValue(player.UserId.Value, out var value)) + value.WaitingForKick = true; player.CommitSuicide(true, true); @@ -238,15 +238,15 @@ internal static class Helper // } // } // - Server.ExecuteCommand($"kickid {player.UserId}"); - // player.Disconnect(reason); // Broken after last update + // Server.ExecuteCommand($"kickid {player.UserId}"); + player.Disconnect(reason); }); } else { - Server.ExecuteCommand($"kickid {player.UserId}"); + // Server.ExecuteCommand($"kickid {player.UserId}"); - // player.Disconnect(reason); // Broken after last update + player.Disconnect(reason); } if (CS2_SimpleAdmin.UnlockedCommands && reason == NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED) diff --git a/CS2-SimpleAdmin/VERSION b/CS2-SimpleAdmin/VERSION index c22096b..651a4a8 100644 --- a/CS2-SimpleAdmin/VERSION +++ b/CS2-SimpleAdmin/VERSION @@ -1 +1 @@ -1.7.2a \ No newline at end of file +1.7.2b \ No newline at end of file diff --git a/CS2-SimpleAdminApi/CS2-SimpleAdminApi.csproj b/CS2-SimpleAdminApi/CS2-SimpleAdminApi.csproj index b63c31f..ab44926 100644 --- a/CS2-SimpleAdminApi/CS2-SimpleAdminApi.csproj +++ b/CS2-SimpleAdminApi/CS2-SimpleAdminApi.csproj @@ -8,7 +8,7 @@ - +