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

boxshroud fixes

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-02-14 14:00:23 -06:00
parent aa0e993038
commit 8a0303e0f5
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/ClientMessagePump.java
+8
View File
@@ -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);
src/engine/objects/PlayerCharacter.java
+1 -15
View File
@@ -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) {