|
|
@ -4838,8 +4838,6 @@ public class PlayerCharacter extends AbstractCharacter { |
|
|
|
|
|
|
|
|
|
|
|
public static boolean checkIfBoxed(PlayerCharacter player){ |
|
|
|
public static boolean checkIfBoxed(PlayerCharacter player){ |
|
|
|
for(PlayerCharacter pc : SessionManager.getAllActivePlayers()){ |
|
|
|
for(PlayerCharacter pc : SessionManager.getAllActivePlayers()){ |
|
|
|
if(pc.isBoxed) |
|
|
|
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(!pc.isActive) |
|
|
|
if(!pc.isActive) |
|
|
|
continue; |
|
|
|
continue; |
|
|
@ -4847,8 +4845,9 @@ public class PlayerCharacter extends AbstractCharacter { |
|
|
|
if(!pc.enteredWorld) |
|
|
|
if(!pc.enteredWorld) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
if(pc.getClientConnection().machineID.equals(player.getClientConnection().machineID)) |
|
|
|
if(!pc.isBoxed && pc.getClientConnection().machineID.equals(player.getClientConnection().machineID)) |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|