From e91a069b2b2aa5a970cf148691404e902865b59e Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Sat, 12 Dec 2015 21:27:43 +0000
Subject: [PATCH] - Fixed a check in isPreferredTarget AI function.

---
 forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java | 2 +-
 forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
index 79972bd4b45..05d34df98e6 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
@@ -944,7 +944,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
         }
 
         // Only care about combatants during combat
-        if (game.getPhaseHandler().inCombat()) {
+        if (game.getPhaseHandler().inCombat() && origin.equals(ZoneType.Battlefield)) {
             list = CardLists.getValidCards(list, "Card.attacking,Card.blocking", null, null);
         }
 
diff --git a/forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt b/forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt
index e31ee130379..e50592a53c2 100644
--- a/forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt
+++ b/forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt
@@ -4,6 +4,6 @@ Types:Creature Human Ninja
 PT:2/2
 A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDraw | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
-SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
+SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ninja_of_the_deep_hours.jpg
 Oracle:Ninjutsu {1}{U} ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)\nWhenever Ninja of the Deep Hours deals combat damage to a player, you may draw a card.