diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index 345153eb..dd994fe1 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -4818,7 +4818,7 @@ public class PlayerCharacter extends AbstractCharacter { if(!this.timestamps.containsKey("nextBoxCheck")) this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 10000); - if(!this.isBoxed && this.timestamps.get("nextBoxCheck") > System.currentTimeMillis()) { + if(!this.isBoxed && this.timestamps.get("nextBoxCheck") < System.currentTimeMillis()) { this.isBoxed = checkIfBoxed(this); this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 10000); } @@ -4853,20 +4853,24 @@ public class PlayerCharacter extends AbstractCharacter { } public static boolean checkIfBoxed(PlayerCharacter player){ - String machineID = player.getClientConnection().machineID; - ArrayList sameMachine = new ArrayList<>(); - for(PlayerCharacter pc : SessionManager.getAllActivePlayerCharacters()){ - if(!pc.equals(player) && pc. isActive && pc.isEnteredWorld() && pc.getClientConnection().machineID.equals(machineID)){ - sameMachine.add(pc); + try { + String machineID = player.getClientConnection().machineID; + ArrayList sameMachine = new ArrayList<>(); + for (PlayerCharacter pc : SessionManager.getAllActivePlayerCharacters()) { + if (!pc.equals(player) && pc.isActive && pc.isEnteredWorld() && pc.getClientConnection().machineID.equals(machineID)) { + sameMachine.add(pc); + } } - } - boolean boxed = false; - for(PlayerCharacter pc : sameMachine) - if(!pc.isBoxed) - boxed = true; + boolean boxed = false; + for (PlayerCharacter pc : sameMachine) + if (!pc.isBoxed) + boxed = true; - return boxed; + return boxed; + }catch(Exception e){ + return false; + } } @Override public void updateFlight() {