dont mark as rebel in lr

destoer · Dec 6, 2023 · d2b8d9f · d2b8d9f
1 parent e17fb0d
commit d2b8d9f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/Jail.cs b/src/Jail.cs
@@ -425,7 +425,7 @@ HookResult OnWeaponFire(EventWeaponFire @event, GameEventInfo info)
     }
 
 
-    static Warden warden = new Warden();
-    static LastRequest lr = new LastRequest();
-    static SpecialDay sd = new SpecialDay();
+    public static Warden warden = new Warden();
+    public static LastRequest lr = new LastRequest();
+    public static SpecialDay sd = new SpecialDay();
 }
diff --git a/src/LastRequest/LastRequest.cs b/src/LastRequest/LastRequest.cs
@@ -550,7 +550,7 @@ bool is_valid_t(CCSPlayerController? player)
         return null;
     }
 
-    bool in_lr(CCSPlayerController? player)
+    public bool in_lr(CCSPlayerController? player)
     {
         return find_lr(player) != null;        
     }

diff --git a/src/Warden/JailPlayer.cs b/src/Warden/JailPlayer.cs
@@ -33,6 +33,15 @@ public void set_rebel(CCSPlayerController? player)
             return;
         }
 
+        // ignore if they are in lr
+        if(JailPlugin.global_ctx != null)
+        {
+            if(JailPlugin.lr.in_lr(player))
+            {
+                return;
+            }
+        }
+
         // dont care if player is invalid
         if(!player.is_valid() || player == null)
         {