Merge 84646e4451 into 2defb2fe14

- Fix for server loading

CS2-SimpleAdmin/CS2-SimpleAdmin.cs

@@ -30,6 +30,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
         if (hotReload)
         {
             ServerLoaded = false;
+            _serverLoading = false;
             OnGameServerSteamAPIActivated();
             OnMapStart(string.Empty);
 

CS2-SimpleAdmin/Events.cs

@@ -17,6 +17,8 @@ namespace CS2_SimpleAdmin;
 
 public partial class CS2_SimpleAdmin
 {
+    private bool _serverLoading;
+    
     private void RegisterEvents()
     {
         RegisterListener<Listeners.OnMapStart>(OnMapStart);
@@ -49,6 +51,10 @@ public partial class CS2_SimpleAdmin
 
     private void OnGameServerSteamAPIActivated()
     {
+        if (_serverLoading)
+            return;
+        
+        _serverLoading = true;
         new ServerManager().LoadServerData();
     }
 
@@ -237,9 +243,13 @@ public partial class CS2_SimpleAdmin
             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;
         }
         
@@ -330,11 +340,11 @@ public partial class CS2_SimpleAdmin
         if (Config.OtherSettings.ReloadAdminsEveryMapChange && ServerLoaded && ServerId != null)
             AddTimer(3.0f, () => ReloadAdmins(null));
 
-        AddTimer(34, () =>
+        // AddTimer(34, () =>
-        {
+        // {
-            if (!ServerLoaded)
+        //     if (!ServerLoaded)
-                OnGameServerSteamAPIActivated();
+        //         OnGameServerSteamAPIActivated();
-        });
+        // });
 
         GodPlayers.Clear();
         SilentPlayers.Clear();

CS2-SimpleAdmin/Managers/ServerManager.cs

@@ -15,7 +15,7 @@ public class ServerManager
         {
             if (CS2_SimpleAdmin.ServerLoaded || CS2_SimpleAdmin.ServerId != null || CS2_SimpleAdmin.Database == null) return;
             
-            if (_getIpTryCount > 16)
+            if (_getIpTryCount > 16 && Helper.GetServerIp().StartsWith("0.0.0.0") || string.IsNullOrEmpty(Helper.GetServerIp()))
             {
                 CS2_SimpleAdmin._logger?.LogError("Unable to load server data - can't fetch ip address!");
                 return;
@@ -40,6 +40,8 @@ public class ServerManager
             var hostname = ConVar.Find("hostname")!.StringValue;
             CS2_SimpleAdmin.IpAddress = address;
             
+            CS2_SimpleAdmin._logger?.LogInformation("Loaded server with ip {ip}", ipAddress);
+
             Task.Run(async () =>
             {
                 try

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

@@ -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}** 在服务器 `HOSTNAME` 上发出了 `{1}` 命令",