From 45b210ddc2e6556aee4ccf5855299cc0d8392a1f Mon Sep 17 00:00:00 2001 From: ArsenalNut Date: Thu, 29 Nov 2012 15:13:34 +0000 Subject: [PATCH] changed "getParentTargeting" methods to skip checking the "child" SpellAbility first --- src/main/java/forge/card/spellability/SpellAbility.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/forge/card/spellability/SpellAbility.java b/src/main/java/forge/card/spellability/SpellAbility.java index e6f891dde4f..535d92f4097 100644 --- a/src/main/java/forge/card/spellability/SpellAbility.java +++ b/src/main/java/forge/card/spellability/SpellAbility.java @@ -1705,11 +1705,12 @@ public abstract class SpellAbility implements ISpellAbility { while (parent.getParent() != null) { + parent = parent.getParent(); Target tgt = parent.getTarget(); if (tgt != null && tgt.getTargetCards() != null && !tgt.getTargetCards().isEmpty()) { break; } - parent = parent.getParent(); + } return parent; } @@ -1725,11 +1726,12 @@ public abstract class SpellAbility implements ISpellAbility { SpellAbility parent = this; while (parent.getParent() != null) { + parent = parent.getParent(); Target tgt = parent.getTarget(); if (tgt != null && tgt.getTargetSAs() != null && !tgt.getTargetSAs().isEmpty()) { break; } - parent = parent.getParent(); + } return parent; } @@ -1745,11 +1747,12 @@ public abstract class SpellAbility implements ISpellAbility { SpellAbility parent = this; while (parent.getParent() != null) { + parent = parent.getParent(); Target tgt = parent.getTarget(); if (tgt != null && tgt.getTargetPlayers() != null && !tgt.getTargetPlayers().isEmpty()) { break; } - parent = parent.getParent(); + } return parent; }