From 35ef86110f77d8052cd229b88a56432725d5989b Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Sat, 8 Mar 2025 10:20:15 -0600 Subject: [PATCH] PVE flag --- src/engine/gameManager/PowersManager.java | 6 +++--- src/engine/powers/ActionsBase.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/engine/gameManager/PowersManager.java b/src/engine/gameManager/PowersManager.java index 28dc3099..8797adac 100644 --- a/src/engine/gameManager/PowersManager.java +++ b/src/engine/gameManager/PowersManager.java @@ -1105,7 +1105,7 @@ public enum PowersManager { continue; // If something blocks the action, then stop - if (ab.blocked(target, pb, trains, null)) { + if (ab.blocked(target, pb, trains, playerCharacter)) { PowersManager.sendEffectMsg(playerCharacter, 5, ab, pb); continue; @@ -1292,7 +1292,7 @@ public enum PowersManager { continue; // If something blocks the action, then stop - if (ab.blocked(target, pb, trains, null)) + if (ab.blocked(target, pb, trains, caster)) continue; // TODO handle overwrite stack order here String stackType = ab.getStackType(); @@ -1927,7 +1927,7 @@ public enum PowersManager { if (trains < ab.getMinTrains() || trains > ab.getMaxTrains()) continue; // If something blocks the action, then stop - if (ab.blocked(target, pb, trains, null)) + if (ab.blocked(target, pb, trains, ac)) // sendPowerMsg(pc, 5, msg); continue; // TODO handle overwrite stack order here diff --git a/src/engine/powers/ActionsBase.java b/src/engine/powers/ActionsBase.java index 3c0c9c1a..9ae7339e 100644 --- a/src/engine/powers/ActionsBase.java +++ b/src/engine/powers/ActionsBase.java @@ -239,6 +239,7 @@ public class ActionsBase { //Add blocked types here public boolean blocked(AbstractWorldObject awo, PowersBase pb, int trains, AbstractCharacter source) { + if (AbstractWorldObject.IsAbstractCharacter(awo)) { AbstractCharacter target = (AbstractCharacter) awo; if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){ @@ -250,6 +251,7 @@ public class ActionsBase { } } } + if(pb.isChant) return false;