Browse Source

boxshroud fixes

lakebane-master
FatBoy-DOTC 9 months ago
parent
commit
8a0303e0f5
  1. 8
      src/engine/net/client/ClientMessagePump.java
  2. 16
      src/engine/objects/PlayerCharacter.java

8
src/engine/net/client/ClientMessagePump.java

@ -1888,6 +1888,14 @@ public class ClientMessagePump implements NetMsgHandler { @@ -1888,6 +1888,14 @@ public class ClientMessagePump implements NetMsgHandler {
break;
case LEAVEREQUEST:
origin.disconnect();
ArrayList<PlayerCharacter> sameMachine = new ArrayList<>();
for (PlayerCharacter pc : SessionManager.getAllActivePlayers()) {
if(origin.machineID.equals(pc.getClientConnection().machineID))
sameMachine.add(pc);
}
if(sameMachine.isEmpty() == false){
sameMachine.get(0).isBoxed = false;
}
break;
case POWER:
PowersManager.usePower((PerformActionMsg) msg, origin, false);

16
src/engine/objects/PlayerCharacter.java

@ -4815,21 +4815,7 @@ public class PlayerCharacter extends AbstractCharacter { @@ -4815,21 +4815,7 @@ public class PlayerCharacter extends AbstractCharacter {
this.safeZone = this.isInSafeZone();
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)) {
this.isBoxed = true;
PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
return;
}
}
PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
}
} catch (Exception e) {

Loading…
Cancel
Save