Add player check

edgegamers · Feb 21, 2024 · 2f027d6 · 2f027d6
1 parent 481409b
commit 2f027d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/mod/Jailbreak.LastRequest/LastRequestCommand.cs b/mod/Jailbreak.LastRequest/LastRequestCommand.cs
@@ -64,6 +64,12 @@ public void Command_LastRequest(CCSPlayerController? executor, CommandInfo info)
             return;
         }
 
+        if (!playerSelector.WouldHavePlayers())
+        {
+            info.ReplyToCommand("There are no players available to LR.");
+            return;
+        }
+
         if (info.ArgCount == 1)
         {
             MenuManager.OpenCenterHtmlMenu(plugin, executor, menuSelector.GetMenu());
@@ -112,7 +118,6 @@ public void Command_LastRequest(CCSPlayerController? executor, CommandInfo info)
         if (!_lrManager.InitiateLastRequest(executor, player, (LRType)type))
         {
             info.ReplyToCommand("An error occurred while initiating the last request. Please try again later.");
-            return;
         }
     }
 }
diff --git a/mod/Jailbreak.LastRequest/LastRequestPlayerSelector.cs b/mod/Jailbreak.LastRequest/LastRequestPlayerSelector.cs
@@ -36,6 +36,8 @@ public CenterHtmlMenu CreateMenu(CCSPlayerController player, LRType lrType)
         return menu;
     }
 
+    public bool WouldHavePlayers() => Utilities.GetPlayers().Any(p => p.IsReal() && p is { PawnIsAlive: true, Team: CsTeam.CounterTerrorist });
+
     private void OnSelect(CCSPlayerController player, ChatMenuOption option, LRType lr, CCSPlayerController target)
     {
         player.ExecuteClientCommandFromServer("css_lr " + ((int) lr) + " #" + target.UserId);