From a6662b5dccac3564b00044a21054ca4941676532 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 30 Aug 2015 21:14:11 +0200
Subject: [PATCH] * Spellskite - Fixed a bug of log message. Fixed a bug that
 multiple targets from different target instances could be changed with one
 activation.

---
 .../src/mage/sets/newphyrexia/Spellskite.java | 57 +++++++++++--------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java b/Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java
index ba7b8ebc63..5a9ee31b04 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java
@@ -120,33 +120,44 @@ class SpellskiteEffect extends OneShotEffect {
                     target.addTarget(source.getSourceId(), stackObject.getStackAbility(), game);
                 }
             } else {
-                Player player = game.getPlayer(source.getControllerId());
-                for (Target target : targets) {
-                    for (UUID targetId : target.getTargets()) {
-                        MageObject object = game.getObject(targetId);
-                        String name;
-                        if (object == null) {
-                            Player targetPlayer = game.getPlayer(targetId);
-                            name = targetPlayer.getLogName();
-                        } else {
-                            name = object.getLogName();
-                        }
-                        if (!targetId.equals(source.getSourceId()) && target.getTargets().contains(source.getSourceId())) {
-                            // you can't change this target to Spellskite because Spellskite is already another targetId of that target.
-                            twoTimesTarget = true;
-                            continue;
-                        }
-                        if (name != null && player.chooseUse(Outcome.Neutral, "Change target from " + name + " to " + sourceObject.getLogName() + "?", source, game)) {
+                Player controller = game.getPlayer(source.getControllerId());
+                boolean validTargets = false;
+                do {
+                    for (Target target : targets) {
+                        for (UUID targetId : target.getTargets()) {
+                            MageObject object = game.getObject(targetId);
+                            String name;
+                            if (object == null) {
+                                Player targetPlayer = game.getPlayer(targetId);
+                                name = targetPlayer.getLogName();
+                            } else {
+                                name = object.getLogName();
+                            }
+                            if (!targetId.equals(source.getSourceId()) && target.getTargets().contains(source.getSourceId())) {
+                                // you can't change this target to Spellskite because Spellskite is already another targetId of that target.
+                                twoTimesTarget = true;
+                                continue;
+                            }
                             if (target.canTarget(stackObject.getControllerId(), source.getSourceId(), sourceAbility, game)) {
-                                oldTarget = game.getObject(targets.getFirstTarget());
-                                target.remove(targetId);
-                                // The source is still the spell on the stack
-                                target.addTarget(source.getSourceId(), stackObject.getStackAbility(), game);
-                                break;
+                                validTargets = true;
+                                if (name != null
+                                        && controller.chooseUse(Outcome.Neutral, "Change target from " + name + " to " + sourceObject.getLogName() + "?", source, game)) {
+                                    oldTarget = game.getObject(targetId);
+                                    target.remove(targetId);
+                                    // The source is still the spell on the stack
+                                    target.addTarget(source.getSourceId(), stackObject.getStackAbility(), game);
+                                    break;
+                                }
                             }
                         }
+                        if (oldTarget != null) {
+                            break;
+                        }
                     }
-                }
+                    if (oldTarget == null) {
+                        game.informPlayer(controller, "You have to select at least one target to change to spellskite!");
+                    }
+                } while (validTargets && oldTarget == null);
             }
             if (oldTarget != null) {
                 game.informPlayers(sourceObject.getLogName() + ": Changed target of " + stackObject.getLogName() + " from " + oldTarget.getLogName() + " to " + sourceObject.getLogName());