Browse Source

boxshroud fixes

lakebane-master
FatBoy-DOTC 10 months ago
parent
commit
e414304e94
  1. 9
      src/engine/InterestManagement/InterestManager.java
  2. 17
      src/engine/objects/PlayerCharacter.java

9
src/engine/InterestManagement/InterestManager.java

@ -538,15 +538,6 @@ public enum InterestManager implements Runnable {
player.getCharItemManager().addGoldToInventory(50000, true); player.getCharItemManager().addGoldToInventory(50000, true);
} }
player.isBoxed = false; player.isBoxed = false;
for (String name : player.effects.keySet()) {
Effect eff = player.effects.get(name);
if (eff == null) {
return;
}
//remove deathshroud here!
if (eff.getEffectToken() == 1672601862)
player.effects.remove(name);
}
for(PlayerCharacter pc : SessionManager.getAllActivePlayers()){ for(PlayerCharacter pc : SessionManager.getAllActivePlayers()){
if(pc.isActive() == false) if(pc.isActive() == false)
continue; continue;

17
src/engine/objects/PlayerCharacter.java

@ -4814,7 +4814,22 @@ public class PlayerCharacter extends AbstractCharacter {
this.safeZone = this.isInSafeZone(); this.safeZone = this.isInSafeZone();
if(this.isBoxed == true && 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)){
//add deatshroud effect
if(pc.isBoxed == true)
continue;
this.isBoxed = true;
return;
}
}
if(this.isBoxed)
PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false); PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
} catch (Exception e) { } catch (Exception e) {

Loading…
Cancel
Save