|
|
|
@ -1105,7 +1105,7 @@ public enum PowersManager {
@@ -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 {
@@ -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 {
@@ -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
|
|
|
|
|