FatBoy/lakebane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

box check

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-06-15 18:50:40 -05:00
parent 683422f8a4
commit 6375b4431c
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/PlayerCharacter.java
+9 -5
View File
@@ -4818,7 +4818,7 @@ public class PlayerCharacter extends AbstractCharacter {
if(!this.timestamps.containsKey("nextBoxCheck")) if(!this.timestamps.containsKey("nextBoxCheck"))
this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 10000); 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.isBoxed = checkIfBoxed(this);
this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 10000); this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 10000);
} }
@@ -4853,20 +4853,24 @@ public class PlayerCharacter extends AbstractCharacter {
} }
public static boolean checkIfBoxed(PlayerCharacter player){ public static boolean checkIfBoxed(PlayerCharacter player){
try {
String machineID = player.getClientConnection().machineID; String machineID = player.getClientConnection().machineID;
ArrayList<PlayerCharacter> sameMachine = new ArrayList<>(); ArrayList<PlayerCharacter> sameMachine = new ArrayList<>();
for(PlayerCharacter pc : SessionManager.getAllActivePlayerCharacters()){ for (PlayerCharacter pc : SessionManager.getAllActivePlayerCharacters()) {
if(!pc.equals(player) && pc. isActive && pc.isEnteredWorld() && pc.getClientConnection().machineID.equals(machineID)){ if (!pc.equals(player) && pc.isActive && pc.isEnteredWorld() && pc.getClientConnection().machineID.equals(machineID)) {
sameMachine.add(pc); sameMachine.add(pc);
} }
} }
boolean boxed = false; boolean boxed = false;
for(PlayerCharacter pc : sameMachine) for (PlayerCharacter pc : sameMachine)
if(!pc.isBoxed) if (!pc.isBoxed)
boxed = true; boxed = true;
return boxed; return boxed;
}catch(Exception e){
return false;
}
} }
@Override @Override
public void updateFlight() { public void updateFlight() {