From 3553291d1dbf21b3eae636ef6c9da50df3738a37 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Sat, 2 Mar 2024 16:56:40 -0600
Subject: [PATCH] combat bug fix
---
src/engine/objects/PlayerCharacter.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java
index 6d8fbc82..34161e85 100644
--- a/src/engine/objects/PlayerCharacter.java
+++ b/src/engine/objects/PlayerCharacter.java
@@ -4838,15 +4838,13 @@ public class PlayerCharacter extends AbstractCharacter {
public static boolean checkIfBoxed(PlayerCharacter player){
for(PlayerCharacter pc : SessionManager.getAllActivePlayers()){
-
if(!pc.isActive)
continue;
-
if(!pc.enteredWorld)
continue;
-
- if(!pc.isBoxed && pc.getClientConnection().machineID.equals(player.getClientConnection().machineID))
- return true;
+ if(pc.getClientConnection().machineID.equals(player.getClientConnection().machineID))
+ if(pc.isBoxed == false)
+ return true;
}
return false;