From 115512ad9bd5af71bbe33659f6233565526aeff8 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 12 Mar 2017 20:59:35 +0100 Subject: [PATCH] * Spellskite - Fixed a bug that target could not always be chnaged to Spellskite if other modes already targeted Spellskite. --- Mage.Sets/src/mage/cards/s/Spellskite.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Mage.Sets/src/mage/cards/s/Spellskite.java b/Mage.Sets/src/mage/cards/s/Spellskite.java index b0b3ee3e6a7..96bf870751e 100644 --- a/Mage.Sets/src/mage/cards/s/Spellskite.java +++ b/Mage.Sets/src/mage/cards/s/Spellskite.java @@ -127,16 +127,12 @@ class SpellskiteEffect extends OneShotEffect { boolean validTargets = false; do { for (Target target : targets) { + if (target.getTargets().contains(source.getSourceId())) { // You can't change a traget to Spellskite, if Spellskite is already targeted by this target + continue; + } for (UUID targetId : target.getTargets()) { String name = getTargetName(targetId, game); - if (targetId.equals(source.getSourceId()) - || target.getTargets().contains(source.getSourceId())) { - // you can't change this target to source because the source is already another targetId of that target. - twoTimesTarget = true; - continue; - } - if (target.canTarget(stackObject.getControllerId(), source.getSourceId(), sourceAbility, game) - && !twoTimesTarget) { + if (target.canTarget(stackObject.getControllerId(), source.getSourceId(), sourceAbility, game)) { validTargets = true; if (name != null && controller.chooseUse(Outcome.Neutral, "Change target from " + name + " to " + sourceObject.getLogName() + '?', source, game)) {