From e46c9b6aff4f7c4f651903c31bf0803fc7bf1b1b Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Fri, 21 Apr 2017 13:41:00 +0000
Subject: [PATCH] - Fixed Failure // Comply returning to hand together with the
 targeted spell on stack.

---
 .../main/java/forge/game/ability/effects/ChangeZoneEffect.java | 3 ++-
 forge-gui/res/cardsfolder/upcoming/failure_comply.txt          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
index b71f28695d3..4b97121ae78 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
@@ -365,7 +365,8 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
      *            a {@link forge.game.spellability.SpellAbility} object.
      */
     private void changeKnownOriginResolve(final SpellAbility sa) {
-        Iterable<Card> tgtCards = getTargetCards(sa);
+        final boolean onlySpells = sa.hasParam("OnlySpells");
+        Iterable<Card> tgtCards = !onlySpells ? getTargetCards(sa) : new CardCollection();
         final TargetRestrictions tgt = sa.getTargetRestrictions();
         final Player player = sa.getActivatingPlayer();
         final Card hostCard = sa.getHostCard();
diff --git a/forge-gui/res/cardsfolder/upcoming/failure_comply.txt b/forge-gui/res/cardsfolder/upcoming/failure_comply.txt
index b867d13d132..f57ca153ca3 100644
--- a/forge-gui/res/cardsfolder/upcoming/failure_comply.txt
+++ b/forge-gui/res/cardsfolder/upcoming/failure_comply.txt
@@ -2,7 +2,7 @@ Name:Failure
 ManaCost:1 U
 AlternateMode: Split
 Types:Instant
-A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Card | TgtZone$ Stack | Origin$ Stack | Fizzle$ True | Destination$ Hand | SpellDescription$ Return target spell to its owner's hand.
+A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Card | OnlySpells$ True | TgtZone$ Stack | Origin$ Stack | Fizzle$ True | Destination$ Hand | SpellDescription$ Return target spell to its owner's hand.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/failure_comply.jpg
 Oracle:Return target spell to its owner's hand.