boxshroud fixes
This commit is contained in:
@@ -1888,6 +1888,14 @@ public class ClientMessagePump implements NetMsgHandler {
|
|||||||
break;
|
break;
|
||||||
case LEAVEREQUEST:
|
case LEAVEREQUEST:
|
||||||
origin.disconnect();
|
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;
|
break;
|
||||||
case POWER:
|
case POWER:
|
||||||
PowersManager.usePower((PerformActionMsg) msg, origin, false);
|
PowersManager.usePower((PerformActionMsg) msg, origin, false);
|
||||||
|
|||||||
@@ -4815,21 +4815,7 @@ public class PlayerCharacter extends AbstractCharacter {
|
|||||||
this.safeZone = this.isInSafeZone();
|
this.safeZone = this.isInSafeZone();
|
||||||
|
|
||||||
if(this.isBoxed && this.containsEffect(1672601862) == false) {
|
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);
|
PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|||||||
Reference in New Issue
Block a user