Fixed a bug that no weapons were given due to gamerules mismatch

Author: Ravid-A

Modules/Core.cs

@@ -17,33 +17,10 @@ public class Core : BasePlugin
     public static Core Plugin = null!;
 
     public override string ModuleName => "[Retakes] Weapons Allocator";
-    public override string ModuleVersion => "1.0.4";
+    public override string ModuleVersion => "1.0.5";
     public override string ModuleAuthor => "Ravid & B3none";
     public override string ModuleDescription => "Weapons Allocator plugin for retakes";
 
-    private static CCSGameRules? _gameRules;
-    
-    private static void SetGameRules()
-    {
-        var gameRulesEntities = Utilities.FindAllEntitiesByDesignerName<CCSGameRulesProxy>("cs_gamerules");
-
-        if (gameRulesEntities.Any())
-        {
-            _gameRules = gameRulesEntities.First().GameRules!;
-        }
-    }
-
-    private static bool WarmupRunning
-    {
-        get
-        {
-            if (_gameRules is null)
-                SetGameRules();
-
-            return _gameRules is not null && _gameRules.WarmupPeriod;
-        }
-    }
-
     public static Config Config = null!;
 
     public static Database Db = null!;
@@ -77,9 +54,18 @@ public override void Unload(bool hotReload)
         Utilities.GetPlayers().ForEach(RemovePlayerFromList);
     }
 
-    public static bool IsLive()
+    public static CCSGameRules GetGameRules()
     {
-        return !WarmupRunning;
+        var gameRulesEntities = Utilities.FindAllEntitiesByDesignerName<CCSGameRulesProxy>("cs_gamerules");
+        var gameRules = gameRulesEntities.First().GameRules;
+
+        if(gameRules == null!)
+        {
+            ThrowError("Failed to get game rules");
+            return null!;
+        }
+
+        return gameRules;
     }
 
     private static void SQL_ConnectCallback(string connectionString, Exception exception, dynamic data)

Modules/Handlers/Events.cs

@@ -17,7 +17,7 @@ public static void RegisterEvents()
 
     private static HookResult OnRoundPreStart(EventRoundPrestart @event, GameEventInfo info)
     {
-        if (!IsLive())
+        if (GetGameRules().WarmupPeriod)
         {
             return HookResult.Continue;
         }
@@ -29,17 +29,16 @@ private static HookResult OnRoundPreStart(EventRoundPrestart @event, GameEventIn
 
     private static HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
     {
-        var playerController = @event.Userid;
-
-        if (playerController == null! || !playerController.IsValid)
+        if(GetGameRules().WarmupPeriod)
         {
-            PrintToServer("OnPlayerSpawn: playerController is null or invalid");
             return HookResult.Continue;
         }
 
-        if (!IsLive())
+        var playerController = @event.Userid;
+
+        if (playerController == null! || !playerController.IsValid)
         {
-            PrintToServer("OnPlayerSpawn: not live");
+            PrintToServer("OnPlayerSpawn: playerController is null or invalid");
             return HookResult.Continue;
         }
 

Modules/Models/Player.cs

@@ -94,11 +94,6 @@ public void CreateSpawnDelay()
 
     private void Timer_GiveWeapons()
     {
-        if (!IsLive())
-        {
-            return;
-        }
-
         WeaponsAllocator.Allocate();
     }
 }