From 0e6ee1392669aa42cb6e1aee0ab14d7c2d7a0771 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Sat, 2 Mar 2024 16:48:19 -0600
Subject: [PATCH] combat bug fix

---
 src/engine/objects/PlayerCharacter.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java
index de332b3a..6d8fbc82 100644
--- a/src/engine/objects/PlayerCharacter.java
+++ b/src/engine/objects/PlayerCharacter.java
@@ -4838,8 +4838,6 @@ public class PlayerCharacter extends AbstractCharacter {
 
     public static boolean checkIfBoxed(PlayerCharacter player){
         for(PlayerCharacter pc : SessionManager.getAllActivePlayers()){
-            if(pc.isBoxed)
-                continue;
 
             if(!pc.isActive)
                 continue;
@@ -4847,8 +4845,9 @@ public class PlayerCharacter extends AbstractCharacter {
             if(!pc.enteredWorld)
                 continue;
 
-            if(pc.getClientConnection().machineID.equals(player.getClientConnection().machineID))
+            if(!pc.isBoxed && pc.getClientConnection().machineID.equals(player.getClientConnection().machineID))
                 return true;
+
         }
         return false;
     }