Merge pull request #8 from oscar-wos/csupdate

fix: cs_gamerules
oscar-wos · Oct 12, 2024 · c6d8bfb · c6d8bfb
2 parents 92229cf + ede1153
commit c6d8bfb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/Events.cs b/src/Events.cs
@@ -11,8 +11,7 @@ private HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
         _roundStart = Server.CurrentTime;
         _bombPlanted = false;
 
-        var gameRules = Utilities.FindAllEntitiesByDesignerName<CCSGameRulesProxy>("cs_gamerules").First().GameRules!;
-        _warmup = gameRules.WarmupPeriod;
+        _gameRules ??= Utilities.FindAllEntitiesByDesignerName<CCSGameRulesProxy>("cs_gamerules").First().GameRules!;
 
         foreach (var zone in _zones)
         {

diff --git a/src/Globals.cs b/src/Globals.cs
@@ -8,7 +8,7 @@ namespace AntiRush;
 public partial class AntiRush
 {
     public override string ModuleName => "AntiRush";
-    public override string ModuleVersion => "1.0.6";
+    public override string ModuleVersion => "1.0.7";
     public override string ModuleAuthor => "https://github.com/oscar-wos/AntiRush";
     public AntiRushConfig Config { get; set; } = new();
     public Menu.Menu Menu { get; } = new();
@@ -18,6 +18,6 @@ public partial class AntiRush
     private readonly List<Zone> _zones = [];
     private float _roundStart;
     private bool _bombPlanted;
-    private bool _warmup;
     private float[] _countdown = [];
+    private CCSGameRules? _gameRules;
 }
diff --git a/src/Listeners.cs b/src/Listeners.cs
@@ -7,7 +7,7 @@ public partial class AntiRush
 {
     private void OnTick()
     {
-        if (!Config.Warmup && _warmup)
+        if (!Config.Warmup && _gameRules is { WarmupPeriod: true })
             return;
 
         if (Config.NoRushTime != 0 && !_bombPlanted)