From 18266580a3d258934ac8c47021a06e18c103ebb4 Mon Sep 17 00:00:00 2001
From: moomarc <moomarc@cardforge.org>
Date: Tue, 2 Apr 2013 10:33:19 +0000
Subject: [PATCH] - Fixed the hidden origin ChangeZone abilities that use a
 target (stack descriptions still need to be reworked but that has been an
 issue for a while)

---
 src/main/java/forge/card/ability/ai/ChangeZoneAi.java       | 2 +-
 .../java/forge/card/ability/effects/ChangeZoneEffect.java   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
index d7a73922bf8..24638acd72b 100644
--- a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
+++ b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
@@ -1071,7 +1071,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
 
         if (tgt != null) {
             if (!tgt.getTargetPlayers().isEmpty()) {
-                player = player != null ? player : tgt.getTargetPlayers().get(0);
+                player = sa.hasParam("DefinedPlayer") ? player : tgt.getTargetPlayers().get(0);
                 if (!player.canBeTargetedBy(sa)) {
                     return;
                 }
diff --git a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
index c5372498ff5..b62c3962279 100644
--- a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
+++ b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
@@ -528,7 +528,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             if (decider instanceof AIPlayer) {
                 ChangeZoneAi.hiddenOriginResolveAI(decider, sa, player);
             } else {
-                changeHiddenOriginResolveHuman((HumanPlayer)decider, sa, player);
+                changeHiddenOriginResolveHuman((HumanPlayer) decider, sa, player);
             }
         }
     }
@@ -554,7 +554,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
         final Target tgt = sa.getTarget();
         if (tgt != null) {
             final List<Player> players = tgt.getTargetPlayers();
-            player = player != null ? player : players.get(0);
+            player = sa.hasParam("DefinedPlayer") ? player : players.get(0);
             if (players.contains(player) && !player.canBeTargetedBy(sa)) {
                 return;
             }
@@ -623,7 +623,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             }
 
             // Look at opponents hand before moving onto choosing a card
-            if (origin.contains(ZoneType.Hand) && player.isOpponentOf(player)) {
+            if (origin.contains(ZoneType.Hand) && player.isOpponentOf(decider)) {
                 GuiChoose.oneOrNone(sa.getSourceCard().getName() + " - Looking at Opponent's Hand", player
                         .getCardsIn(ZoneType.Hand));
             }