From a6a2629fd59f6c181ca50dbd4a5ef5597938a917 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Wed, 14 Feb 2024 13:42:57 -0600 Subject: [PATCH] boxshroud fixes --- src/engine/objects/PlayerCharacter.java | 27 ++++++++++++++----------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index ddaee7c9..4a69143d 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -4814,22 +4814,25 @@ public class PlayerCharacter extends AbstractCharacter { this.safeZone = this.isInSafeZone(); - if(this.isBoxed && this.containsEffect(1672601862) == false) + if(this.isBoxed && this.containsEffect(1672601862) == false) { this.isBoxed = false; - for(PlayerCharacter pc : SessionManager.getAllActivePlayers()){ - if(pc.isActive() == false) - continue; - if(pc.isEnteredWorld() == false) - continue; - if(this.getClientConnection().machineID.equals(pc.getClientConnection().machineID)){ - //add deatshroud effect - if(pc.isBoxed == true) + for (PlayerCharacter pc : SessionManager.getAllActivePlayers()) { + + if (pc.isActive() == false) continue; - this.isBoxed = true; - return; + + if (pc.isEnteredWorld() == false) + continue; + + if (this.getClientConnection().machineID.equals(pc.getClientConnection().machineID)) { + //add deatshroud effect + if (pc.isBoxed == true) + continue; + this.isBoxed = true; + } } } - if(this.isBoxed) + if(this.isBoxed && this.containsEffect(1672601862) == false) PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false); } catch (Exception e) {