Dont attempt auto-open on warmup, properly handle early round ends

edgegamers · Aug 24, 2024 · 7f4b1f6 · 7f4b1f6
1 parent ba5f0da
commit 7f4b1f6
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/mod/Jailbreak.Warden/Global/WardenBehavior.cs b/mod/Jailbreak.Warden/Global/WardenBehavior.cs
@@ -75,7 +75,7 @@ public class WardenBehavior(ILogger<WardenBehavior> logger,
 
   private BasePlugin parent = null!;
   private PreWardenStats? preWardenStats;
-  private Timer? unblueTimer;
+  private Timer? unblueTimer, openCellsTimer;
 
   public void Start(BasePlugin basePlugin) { parent = basePlugin; }
 
@@ -394,6 +394,7 @@ private bool playerHasHealthshot(CCSPlayerController player,
   public HookResult OnRoundEnd(EventRoundEnd ev, GameEventInfo info) {
     TryRemoveWarden();
     mute.UnPeaceMute();
+    openCellsTimer?.Kill();
     return HookResult.Continue;
   }
 
@@ -402,12 +403,13 @@ public HookResult OnRoundStart(EventRoundStart ev, GameEventInfo info) {
     firstWarden    = true;
     preWardenStats = null;
 
-    if (CvWardenAutoOpenCells.Value < 0) return HookResult.Continue;
+    if (CvWardenAutoOpenCells.Value < 0 || RoundUtil.IsWarmup())
+      return HookResult.Continue;
     var openCmd = provider.GetService<IWardenOpenCommand>();
     if (openCmd == null) return HookResult.Continue;
     var cmdLocale = provider.GetRequiredService<IWardenCmdOpenLocale>();
 
-    parent.AddTimer(CvWardenAutoOpenCells.Value, () => {
+    openCellsTimer = parent.AddTimer(CvWardenAutoOpenCells.Value, () => {
       if (openCmd.OpenedCells) return;
       var zone = provider.GetService<IZoneManager>();
       if (zone != null)