Fix warden breaking after guaranteed warden rtd

edgegamers · Sep 20, 2024 · 889868f · 889868f
1 parent f0e5824
commit 889868f
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 3 deletions.
diff --git a/mod/Jailbreak.LastRequest/LastRequestFactory.cs b/mod/Jailbreak.LastRequest/LastRequestFactory.cs
@@ -1,3 +1,4 @@
+using System;
 using CounterStrikeSharp.API.Core;
 using Jailbreak.Formatting.Views.LastRequest;
 using Jailbreak.LastRequest.LastRequests;

diff --git a/mod/Jailbreak.LastRequest/LastRequestManager.cs b/mod/Jailbreak.LastRequest/LastRequestManager.cs
@@ -1,4 +1,8 @@
-using CounterStrikeSharp.API;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Cvars;

diff --git a/mod/Jailbreak.LastRequest/LastRequests/BulletForBullet.cs b/mod/Jailbreak.LastRequest/LastRequests/BulletForBullet.cs
@@ -1,3 +1,4 @@
+using System;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Menu;

diff --git a/mod/Jailbreak.LastRequest/LastRequests/Coinflip.cs b/mod/Jailbreak.LastRequest/LastRequests/Coinflip.cs
@@ -1,3 +1,4 @@
+using System;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Menu;
 using Jailbreak.Formatting.Extensions;

diff --git a/mod/Jailbreak.LastRequest/LastRequests/KnifeFight.cs b/mod/Jailbreak.LastRequest/LastRequests/KnifeFight.cs
@@ -1,3 +1,4 @@
+using System;
 using CounterStrikeSharp.API.Core;
 using Jailbreak.Public.Mod.LastRequest.Enums;
 

diff --git a/mod/Jailbreak.LastRequest/LastRequests/NoScope.cs b/mod/Jailbreak.LastRequest/LastRequests/NoScope.cs
@@ -1,3 +1,4 @@
+using System;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Timers;

diff --git a/mod/Jailbreak.LastRequest/LastRequests/RockPaperScissors.cs b/mod/Jailbreak.LastRequest/LastRequests/RockPaperScissors.cs
@@ -1,3 +1,4 @@
+using System;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Menu;
 using CounterStrikeSharp.API.Modules.Timers;

diff --git a/mod/Jailbreak.LastRequest/LastRequests/WeaponizedRequest.cs b/mod/Jailbreak.LastRequest/LastRequests/WeaponizedRequest.cs
@@ -1,3 +1,4 @@
+using System;
 using CounterStrikeSharp.API.Core;
 using Jailbreak.Formatting.Extensions;
 using Jailbreak.Formatting.Views.LastRequest;

diff --git a/mod/Jailbreak.Warden/Selection/WardenSelectionBehavior.cs b/mod/Jailbreak.Warden/Selection/WardenSelectionBehavior.cs
@@ -112,6 +112,7 @@ public void ScheduleChooseWarden(float time = 7.0f) {
   /// </summary>
   protected void OnChooseWarden() {
     guaranteedWarden.Clear();
+    queueInactive = true;
     if (warden.HasWarden) return;
     var eligible = Utilities.GetPlayers()
      .Where(player => player.PawnIsAlive)
@@ -124,7 +125,6 @@ protected void OnChooseWarden() {
 
     if (eligible.Count == 0) {
       locale.NoWardens.ToAllChat();
-      queueInactive = true;
 
       return;
     }
@@ -154,7 +154,6 @@ protected void OnChooseWarden() {
 
     //	Disable the warden raffle for future wardens
     //	(eg in the event of warden death)
-    queueInactive = true;
   }
 
   private bool canEnterQueue(CCSPlayerController player) {