Handle commands from the server properly

abnerfs · Mar 16, 2024 · 5bf6a91 · 5bf6a91
1 parent 43cfcb6
commit 5bf6a91
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 45 deletions.
diff --git a/Features/NextMapCommand.cs b/Features/NextMapCommand.cs
@@ -17,21 +17,20 @@ public NextMapCommand(ChangeMapManager changeMapManager, StringLocalizer stringL
 
         public void CommandHandler(CCSPlayerController? player)
         {
-            if (player is not null)
+            string text;
+            if (_changeMapManager.NextMap is not null)
             {
-                string text;
-                if (_changeMapManager.NextMap is not null)
-                {
-                    text = _stringLocalizer.LocalizeWithPrefix("nextmap", _changeMapManager.NextMap);
-                }
-                else
-                    text = _stringLocalizer.LocalizeWithPrefix("nextmap.decided-by-vote");
-
-                if (_config.ShowToAll)
-                    Server.PrintToChatAll(text);
-                else
-                    player.PrintToChat(text);
+                text = _stringLocalizer.LocalizeWithPrefix("nextmap", _changeMapManager.NextMap);
             }
+            else
+                text = _stringLocalizer.LocalizeWithPrefix("nextmap.decided-by-vote");
+
+            if (_config.ShowToAll)
+                Server.PrintToChatAll(text);
+            else if (player is not null)
+                player.PrintToChat(text);
+            else
+                Server.PrintToConsole(text);
         }
 
         public void OnLoad(Plugin plugin)

diff --git a/Features/NominationCommand.cs b/Features/NominationCommand.cs
@@ -68,8 +68,11 @@ public void OnMapsLoaded(object? sender, Map[] maps)
             }
         }
 
-        public void CommandHandler(CCSPlayerController player, string map)
+        public void CommandHandler(CCSPlayerController? player, string map)
         {
+            if (player is null)
+                return;
+
             map = map.ToLower().Trim();
             if (_pluginState.DisableCommands || !_config.NominationEnabled)
             {

diff --git a/Features/RockTheVoteCommand.cs b/Features/RockTheVoteCommand.cs
@@ -46,8 +46,11 @@ public void OnMapStart(string map)
             _voteManager!.OnMapStart(map);
         }
 
-        public void CommandHandler(CCSPlayerController player)
+        public void CommandHandler(CCSPlayerController? player)
         {
+            if (player is null)
+                return;
+
             if (_pluginState.DisableCommands || !_config.Enabled)
             {
                 player.PrintToChat(_localizer.LocalizeWithPrefix("general.validation.disabled"));

diff --git a/Features/TimeLeftCommand.cs b/Features/TimeLeftCommand.cs
@@ -12,7 +12,7 @@ public partial class Plugin
         [ConsoleCommand("timeleft", "Prints in the chat the timeleft in the current map")]
         public void OnTimeLeft(CCSPlayerController? player, CommandInfo? command)
         {
-            _timeLeft.CommandHandler(player!);
+            _timeLeft.CommandHandler(player);
         }
     }
 
@@ -35,13 +35,16 @@ public TimeLeftCommand(TimeLimitManager timeLimitManager, MaxRoundsManager maxRo
 
         }
 
-        public void CommandHandler(CCSPlayerController player)
+        public void CommandHandler(CCSPlayerController? player)
         {
             string text;
 
             if (_gameRules.WarmupRunning)
             {
-                player.PrintToChat(_localizer.LocalizeWithPrefix("general.validation.warmup"));
+                if(player is not null)
+                    player.PrintToChat(_localizer.LocalizeWithPrefix("general.validation.warmup"));
+                else
+                    Server.PrintToConsole(_localizer.LocalizeWithPrefix("general.validation.warmup"));
                 return;
             }
 
@@ -82,8 +85,10 @@ public void CommandHandler(CCSPlayerController player)
 
             if (_config.ShowToAll)
                 Server.PrintToChatAll(text);
-            else
+            else if (player is not null)
                 player.PrintToChat(text);
+            else
+                Server.PrintToConsole(text);
         }
 
         public void OnConfigParsed(Config config)

diff --git a/Features/VotemapCommand.cs b/Features/VotemapCommand.cs
@@ -69,8 +69,11 @@ public void OnMapsLoaded(object? sender, Map[] maps)
             }
         }
 
-        public void CommandHandler(CCSPlayerController player, string map)
+        public void CommandHandler(CCSPlayerController? player, string map)
         {
+            if (player is null)
+                return;
+
             map = map.ToLower().Trim();
             if (_pluginState.DisableCommands || !_config.Enabled)
             {

diff --git a/Plugin.cs b/Plugin.cs
@@ -21,7 +21,7 @@ public void ConfigureServices(IServiceCollection serviceCollection)
     public partial class Plugin : BasePlugin, IPluginConfig<Config>
     {
         public override string ModuleName => "RockTheVote";
-        public override string ModuleVersion => "1.7.5";
+        public override string ModuleVersion => "1.7.6";
         public override string ModuleAuthor => "abnerfs";
         public override string ModuleDescription => "General purpose map voting plugin";
 
@@ -67,31 +67,33 @@ public override void Load(bool hotReload)
         public HookResult OnChat(EventPlayerChat @event, GameEventInfo info)
         {
             var player = Utilities.GetPlayerFromUserid(@event.Userid);
-
-            var text = @event.Text.Trim().ToLower();
-            if (text == "rtv")
-            {
-                _rtvManager.CommandHandler(player);
-            }
-            else if (text.StartsWith("nominate"))
-            {
-                var split = text.Split("nominate");
-                var map = split.Length > 1 ? split[1].Trim() : "";
-                _nominationManager.CommandHandler(player, map);
-            }
-            else if (text.StartsWith("votemap"))
-            {
-                var split = text.Split("votemap");
-                var map = split.Length > 1 ? split[1].Trim() : "";
-                _votemapManager.CommandHandler(player, map);
-            }
-            else if (text.StartsWith("timeleft"))
-            {
-                _timeLeft.CommandHandler(player);
-            }
-            else if (text.StartsWith("nextmap"))
+            if(player is not null)
             {
-                _nextMap.CommandHandler(player);
+                var text = @event.Text.Trim().ToLower();
+                if (text == "rtv")
+                {
+                    _rtvManager.CommandHandler(player);
+                }
+                else if (text.StartsWith("nominate"))
+                {
+                    var split = text.Split("nominate");
+                    var map = split.Length > 1 ? split[1].Trim() : "";
+                    _nominationManager.CommandHandler(player, map);
+                }
+                else if (text.StartsWith("votemap"))
+                {
+                    var split = text.Split("votemap");
+                    var map = split.Length > 1 ? split[1].Trim() : "";
+                    _votemapManager.CommandHandler(player, map);
+                }
+                else if (text.StartsWith("timeleft"))
+                {
+                    _timeLeft.CommandHandler(player);
+                }
+                else if (text.StartsWith("nextmap"))
+                {
+                    _nextMap.CommandHandler(player);
+                }
             }
             return HookResult.Continue;
         }