external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed "getParentTargeting" methods to skip checking the "child" SpellAbility first

Browse Source
This commit is contained in:
ArsenalNut
2012-11-29 15:13:34 +00:00
parent e5333375b0
commit 45b210ddc2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/forge/card/spellability/SpellAbility.java
View File

@@ -1705,11 +1705,12 @@ public abstract class SpellAbility implements ISpellAbility {
while (parent.getParent() != null) { while (parent.getParent() != null) {
parent = parent.getParent();
Target tgt = parent.getTarget(); Target tgt = parent.getTarget();
if (tgt != null && tgt.getTargetCards() != null && !tgt.getTargetCards().isEmpty()) { if (tgt != null && tgt.getTargetCards() != null && !tgt.getTargetCards().isEmpty()) {
break; break;
} }
parent = parent.getParent();
} }
return parent; return parent;
} }
@@ -1725,11 +1726,12 @@ public abstract class SpellAbility implements ISpellAbility {
SpellAbility parent = this; SpellAbility parent = this;
while (parent.getParent() != null) { while (parent.getParent() != null) {
parent = parent.getParent();
Target tgt = parent.getTarget(); Target tgt = parent.getTarget();
if (tgt != null && tgt.getTargetSAs() != null && !tgt.getTargetSAs().isEmpty()) { if (tgt != null && tgt.getTargetSAs() != null && !tgt.getTargetSAs().isEmpty()) {
break; break;
} }
parent = parent.getParent();
} }
return parent; return parent;
} }
@@ -1745,11 +1747,12 @@ public abstract class SpellAbility implements ISpellAbility {
SpellAbility parent = this; SpellAbility parent = this;
while (parent.getParent() != null) { while (parent.getParent() != null) {
parent = parent.getParent();
Target tgt = parent.getTarget(); Target tgt = parent.getTarget();
if (tgt != null && tgt.getTargetPlayers() != null && !tgt.getTargetPlayers().isEmpty()) { if (tgt != null && tgt.getTargetPlayers() != null && !tgt.getTargetPlayers().isEmpty()) {
break; break;
} }
parent = parent.getParent();
} }
return parent; return parent;
} }