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

PVE flag

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-03-08 10:20:15 -06:00
parent 3e04f36fd7
commit 35ef86110f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/PowersManager.java
+3 -3
View File
@@ -1105,7 +1105,7 @@ public enum PowersManager {
continue; continue;
// If something blocks the action, then stop // 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); PowersManager.sendEffectMsg(playerCharacter, 5, ab, pb);
continue; continue;
@@ -1292,7 +1292,7 @@ public enum PowersManager {
continue; continue;
// If something blocks the action, then stop // If something blocks the action, then stop
if (ab.blocked(target, pb, trains, null)) if (ab.blocked(target, pb, trains, caster))
continue; continue;
// TODO handle overwrite stack order here // TODO handle overwrite stack order here
String stackType = ab.getStackType(); String stackType = ab.getStackType();
@@ -1927,7 +1927,7 @@ public enum PowersManager {
if (trains < ab.getMinTrains() || trains > ab.getMaxTrains()) if (trains < ab.getMinTrains() || trains > ab.getMaxTrains())
continue; continue;
// If something blocks the action, then stop // 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); // sendPowerMsg(pc, 5, msg);
continue; continue;
// TODO handle overwrite stack order here // TODO handle overwrite stack order here
src/engine/powers/ActionsBase.java
+2
View File
@@ -239,6 +239,7 @@ public class ActionsBase {
//Add blocked types here //Add blocked types here
public boolean blocked(AbstractWorldObject awo, PowersBase pb, int trains, AbstractCharacter source) { public boolean blocked(AbstractWorldObject awo, PowersBase pb, int trains, AbstractCharacter source) {
if (AbstractWorldObject.IsAbstractCharacter(awo)) { if (AbstractWorldObject.IsAbstractCharacter(awo)) {
AbstractCharacter target = (AbstractCharacter) awo; AbstractCharacter target = (AbstractCharacter) awo;
if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){ if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
@@ -250,6 +251,7 @@ public class ActionsBase {
} }
} }
} }
if(pb.isChant) if(pb.isChant)
return false; return false;