Merge 84646e4451 into ab14956ae5

- Revert temp fix for kick

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<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.2a";
+    public override string ModuleVersion => "1.7.2b";
     
     public override void Load(bool hotReload)
     {
@@ -56,8 +56,6 @@ 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.287" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.300" />
     <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="MySqlConnector" Version="2.4.0" />
     <PackageReference Include="Newtonsoft.Json" Version="*" />

CS2-SimpleAdmin/Events.cs

@@ -272,9 +272,13 @@ value.WaitingForKick)
             return HookResult.Stop;
         
         if (command == "say" && info.GetArg(1).StartsWith($"@") &&
-            AdminManager.PlayerHasPermissions(player, "@css/chat"))
+            AdminManager.PlayerHasPermissions(player, "@vip/chat"))
         {
-            player.ExecuteClientCommandFromServer($"css_say {info.GetArg(1).Remove(0, 1)}");
+            sb.Append(_localizer!["sa_vipchat_template", player.PlayerName, info.GetArg(1).Remove(0, 1)]);
+            foreach (var p in Utilities.GetPlayers().Where(p => p.IsValid && p is { IsBot: false, IsHLTV: false } && AdminManager.PlayerHasPermissions(p, "@vip/chat")))
+            {
+                p.PrintToChat(sb.ToString());
+            }
             return HookResult.Stop;
         }
         
@@ -365,6 +369,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)

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[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);
         
@@ -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); 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)
@@ -189,8 +189,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);
         
@@ -211,15 +211,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)

CS2-SimpleAdmin/VERSION

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

CS2-SimpleAdmin/lang/ar.json

@@ -125,6 +125,7 @@
 	"sa_admin_vote_message_results": "{lime}نتائج التصويت لـ {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}الإداري: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(إداري) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(لاعب) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** أصدر الأمر `{1}` على الخادم `HOSTNAME`",

CS2-SimpleAdmin/lang/de.json

@@ -125,6 +125,7 @@
 	"sa_admin_vote_message_results": "{lime}ABSTIMMUNGSERGEBNISSE FÜR {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(SPIELER) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** hat den Befehl `{1}` auf dem Server `HOSTNAME` ausgeführt",

CS2-SimpleAdmin/lang/en.json

@@ -125,6 +125,7 @@
 	"sa_admin_vote_message_results": "{lime}VOTING RESULTS FOR {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(PLAYER) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** issued command `{1}` on server `HOSTNAME`",

CS2-SimpleAdmin/lang/es.json

@@ -125,6 +125,7 @@
 	"sa_admin_vote_message_results": "{lime}RESULTADOS DE LA VOTACIÓN PARA {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(JUGADOR) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** ejecutó el comando `{1}` en el servidor `HOSTNAME`",

CS2-SimpleAdmin/lang/fa.json

@@ -125,6 +125,7 @@
 	"sa_admin_vote_message_results": "{lime}نتایج رأی‌گیری برای {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ادمین: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ادمین) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(بازیکن) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** فرمان `{1}` را در سرور `HOSTNAME` اجرا کرد",

CS2-SimpleAdmin/lang/fr.json

@@ -125,6 +125,7 @@
 	"sa_admin_vote_message_results": "{lime}RÉSULTATS DU VOTE POUR {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(JOUEUR) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** a exécuté la commande `{1}` sur le serveur `HOSTNAME`",

CS2-SimpleAdmin/lang/lv.json

@@ -125,6 +125,7 @@
 	"sa_admin_vote_message_results": "{lime}BALSOŠANAS REZULTĀTI PAR {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(SPĒLĒTĀJS) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** izpildīja komandu `{1}` serverī `HOSTNAME`",

CS2-SimpleAdmin/lang/pl.json

@@ -125,6 +125,7 @@
 	"sa_admin_vote_message_results": "{lime}WYNIKI GŁOSOWANIA {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}[{1}]",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(GRACZ) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** użył komendy `{1}` na serwerze `HOSTNAME`",

CS2-SimpleAdmin/lang/pt-BR.json

@@ -125,6 +125,7 @@
 	"sa_admin_vote_message_results": "{lime}RESULTADOS DA VOTAÇÃO PARA {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(JOGADOR) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** executou o comando `{1}` no servidor `HOSTNAME`",

CS2-SimpleAdmin/lang/pt-PT.json

@@ -125,6 +125,7 @@
 	"sa_admin_vote_message_results": "{lime}RESULTADOS DA VOTAÇÃO PARA {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}ADMIN: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(ADMIN) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(JOGADOR) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** executou o comando `{1}` no servidor `HOSTNAME`",

CS2-SimpleAdmin/lang/ru.json

@@ -125,6 +125,7 @@
 	"sa_admin_vote_message_results": "{lime}РЕЗУЛЬТАТЫ ГОЛОСОВАНИЯ ЗА {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}АДМИН: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(ВИП ЧАТ) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(АДМИН) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(ИГРОК) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** выполнил команду `{1}` на сервере `HOSTNAME`",

CS2-SimpleAdmin/lang/tr.json

@@ -125,6 +125,7 @@
 	"sa_admin_vote_message_results": "{lime}OY SONUÇLARI {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}Yönetici: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(Yönetici) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(Oyuncu) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** `{1}` komutunu `HOSTNAME` sunucusunda gerçekleştirdi",

CS2-SimpleAdmin/lang/zh-Hans.json

@@ -123,6 +123,7 @@
 	"sa_admin_vote_message_results": "{lime}投票结果 {gold}{0}",
 	"sa_admin_vote_message_results_answer": "{lime}{0} {default}- {gold}{1}",
 	"sa_adminsay_prefix": "{RED}管理员: {lightred}{0}{default}",
+	"sa_vipchat_template": "{LIME}(VIP CHAT) {0}{default}: {1}",
 	"sa_adminchat_template_admin": "{LIME}(管理员) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_adminchat_template_player": "{SILVER}(玩家) {lightred}{0}{default}: {lightred}{1}{default}",
 	"sa_discord_log_command": "**{0}** 在服务器 `HOSTNAME` 上执行了命令 `{1}`",

CS2-SimpleAdminApi/CS2-SimpleAdminApi.csproj

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