From 44b5e8cfd92cfcd5a082723764b66ed58dcc8e89 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Sat, 8 Mar 2025 06:32:11 -0600 Subject: [PATCH] PVE flag --- src/engine/gameManager/PowersManager.java | 6 ++---- src/engine/objects/PlayerCharacter.java | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/engine/gameManager/PowersManager.java b/src/engine/gameManager/PowersManager.java index aa0c2c04..8b0944a4 100644 --- a/src/engine/gameManager/PowersManager.java +++ b/src/engine/gameManager/PowersManager.java @@ -1932,7 +1932,7 @@ public enum PowersManager { if (ac.getObjectType().equals(GameObjectType.PlayerCharacter)){ PlayerCharacter pc = (PlayerCharacter) ac; - if (pc.isBoxed) { + if (pc.isBoxed && pb.token != -2133617927) { if(AbstractCharacter.IsAbstractCharacter(target)){ if (target.getObjectType().equals(GameObjectType.PlayerCharacter)){ return; @@ -2023,9 +2023,7 @@ public enum PowersManager { public static void runPowerAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, ActionsBase ab, int trains, PowersBase pb) { AbstractPowerAction pa = ab.getPowerAction(); if (pa == null) { - Logger.error( - "runPowerAction(): PowerAction not found of IDString: " - + ab.getEffectID()); + Logger.error("runPowerAction(): PowerAction not found of IDString: " + ab.getEffectID()); return; } pa.startAction(source, awo, targetLoc, trains, ab, pb); diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index d44b0080..a7d25015 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -5199,17 +5199,20 @@ public class PlayerCharacter extends AbstractCharacter { if (this.isBoxed){// && !this.containsEffect(1672601862)) { //PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false); - if(!this.title.equals(CharacterTitle.PVE)){ - this.title = CharacterTitle.PVE; - InterestManager.setObjectDirty(this); - InterestManager.reloadCharacter(this, false); + //if(!this.title.equals(CharacterTitle.PVE)){ + // this.title = CharacterTitle.PVE; + // InterestManager.setObjectDirty(this); + // InterestManager.reloadCharacter(this, false); + //} + if(!this.containsEffect(496607208)){ + PowersManager.applyPower(this,this,this.loc,-2133617927,40,false); } }else { - if (!this.title.equals(CharacterTitle.NONE)) { - this.title = CharacterTitle.NONE; - InterestManager.setObjectDirty(this); - InterestManager.reloadCharacter(this, false); - } + //if (!this.title.equals(CharacterTitle.NONE)) { + // this.title = CharacterTitle.NONE; + // InterestManager.setObjectDirty(this); + // InterestManager.reloadCharacter(this, false); + //} } } if (this.isFlying()) {