Fix multiple possible issues

edgegamers · Feb 19, 2024 · e99bbdb · e99bbdb
1 parent 1cea2f2
commit e99bbdb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/mod/Jailbreak.LastRequest/LastRequestCommand.cs b/mod/Jailbreak.LastRequest/LastRequestCommand.cs
@@ -93,7 +93,13 @@ public void Command_LastRequest(CCSPlayerController? executor, CommandInfo info)
         var player = target.Players.First();
         if (player.Team != CsTeam.CounterTerrorist)
         {
-            info.ReplyToCommand("Invalid player");
+            info.ReplyToCommand("They're not on CT!");
+            return;
+        }
+
+        if (!player.PawnIsAlive)
+        {
+            info.ReplyToCommand("They're not alive!");
             return;
         }
 

diff --git a/mod/Jailbreak.LastRequest/LastRequestManager.cs b/mod/Jailbreak.LastRequest/LastRequestManager.cs
@@ -44,6 +44,7 @@ public HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
         if (CountAlivePrisoners() > config.PrisonersToActiveLR)
             return HookResult.Continue;
         this.IsLREnabled = true;
+        messages.LastRequestEnabled().ToAllChat();
         return HookResult.Continue;
     }
 
@@ -57,7 +58,7 @@ public HookResult OnPlayerDeath(EventPlayerDeath @event, GameEventInfo info)
         if (player.GetTeam() != CsTeam.Terrorist)
             return HookResult.Continue;
 
-        if (CountAlivePrisoners() > config.PrisonersToActiveLR)
+        if (CountAlivePrisoners() - 1> config.PrisonersToActiveLR)
             return HookResult.Continue;
 
         IsLREnabled = true;

diff --git a/public/Jailbreak.Public/Mod/LastRequest/ILastRequestManager.cs b/public/Jailbreak.Public/Mod/LastRequest/ILastRequestManager.cs
@@ -9,7 +9,7 @@ public interface ILastRequestManager : IPluginBehavior
     public bool IsLREnabled { get; set; }
     public IList<AbstractLastRequest> ActiveLRs { get; }
 
-    void InitiateLastRequest(CCSPlayerController guard, CCSPlayerController prisoner, LRType lrType);
+    void InitiateLastRequest(CCSPlayerController prisoner, CCSPlayerController guard, LRType lrType);
 
     public bool IsInLR(CCSPlayerController player)
     {