From 8b3fadaead74bdf01e5e66652489cf97d3ee5d99 Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Tue, 20 Oct 2015 23:43:18 +0000
Subject: [PATCH] - ChangeZone Fizzling should only occur for Spells, not
 abilities or Triggers.

---
 .../java/forge/game/ability/effects/ChangeZoneEffect.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 16e77982e79..3174ec0b9fa 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
@@ -361,9 +361,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
      * <p>
      * changeKnownOriginResolve.
      * </p>
-     * 
-     * @param af
-     *            a {@link forge.game.ability.AbilityFactory} object.
+     *
      * @param sa
      *            a {@link forge.game.spellability.SpellAbility} object.
      */
@@ -547,6 +545,10 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                     if (sa.hasParam("Fizzle")) {
                         final FCollectionView<SpellAbility> spells = tgtC.getSpellAbilities();
                         for (SpellAbility spell : spells) {
+                            // Only fizzle spells, not anything else.
+                            if (!spell.isSpell())
+                                continue;
+
                             if (tgtC.isInZone(ZoneType.Exile) || tgtC.isInZone(ZoneType.Hand) || tgtC.isInZone(ZoneType.Stack)) {
                                 final SpellAbilityStackInstance si = game.getStack().getInstanceFromSpellAbility(spell);
                                 if (si != null) {