Added fix to prevent a bug where there were no active players

B3none · Jan 6, 2024 · 3baca6b · 3baca6b
1 parent 3517093
commit 3baca6b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Modules/Helpers.cs b/Modules/Helpers.cs
@@ -171,4 +171,9 @@ public static void RemoveHelmetAndHeavyArmour(CCSPlayerController player)
         itemServices.HasHelmet = false;
         itemServices.HasHeavyArmor = false;
     }
+
+    public static void RestartGame()
+    {
+        Server.ExecuteCommand("mp_restartgame 1");
+    }
 }
diff --git a/RetakesPlugin.cs b/RetakesPlugin.cs
@@ -235,7 +235,7 @@ public HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventIn
         if (Utilities.GetPlayers().ToList().Count <= 2)
         {
             Console.WriteLine($"{LogPrefix}First or second player connected, resetting game.");
-            Server.ExecuteCommand("mp_restartgame 1");
+            Helpers.RestartGame();
         }
 
         return HookResult.Continue;
@@ -652,6 +652,13 @@ public HookResult OnPlayerTeam(EventPlayerTeam @event, GameEventInfo info)
         _gameManager.QueueManager.PlayerTriedToJoinTeam(player, (CsTeam)@event.Oldteam, (CsTeam)@event.Team);
         _gameManager.QueueManager.DebugQueues(false);
 
+        // If we don't have any active players, setup the active players and restart the game.
+        if (_gameManager.QueueManager.ActivePlayers.Count == 0)
+        {
+            _gameManager.QueueManager.SetupActivePlayers();
+            Helpers.RestartGame();
+        }
+
         return HookResult.Continue;
     }