|
|
@ -4844,9 +4844,6 @@ public class PlayerCharacter extends AbstractCharacter { |
|
|
|
ItemFactory.fillInventory(this, 980066, 1); |
|
|
|
ItemFactory.fillInventory(this, 980066, 1); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if(this.isBoxed == false){ |
|
|
|
|
|
|
|
this. isBoxed = checkIfBoxed(this); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(this.isBoxed && this.containsEffect(1672601862) == false) {//Deathshroud
|
|
|
|
if(this.isBoxed && this.containsEffect(1672601862) == false) {//Deathshroud
|
|
|
|
PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false); |
|
|
|
PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false); |
|
|
@ -4864,15 +4861,16 @@ public class PlayerCharacter extends AbstractCharacter { |
|
|
|
public static boolean checkIfBoxed(PlayerCharacter player){ |
|
|
|
public static boolean checkIfBoxed(PlayerCharacter player){ |
|
|
|
try { |
|
|
|
try { |
|
|
|
for (PlayerCharacter pc : SessionManager.getAllActivePlayers()) { |
|
|
|
for (PlayerCharacter pc : SessionManager.getAllActivePlayers()) { |
|
|
|
|
|
|
|
if(pc.getClientConnection().machineID.equals(player.getClientConnection().machineID) == false) |
|
|
|
|
|
|
|
continue; |
|
|
|
if (!pc.isActive) |
|
|
|
if (!pc.isActive) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
if (!pc.enteredWorld) |
|
|
|
if (!pc.enteredWorld) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
if (pc.equals(player)) |
|
|
|
if (pc.equals(player)) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
if (pc.getClientConnection().machineID.equals(player.getClientConnection().machineID)) |
|
|
|
if (pc.isBoxed == false) |
|
|
|
if (pc.isBoxed == false) |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
return false; |
|
|
|
return false; |
|
|
|