- ChangeZone Fizzling should only occur for Spells, not abilities or Triggers.

This commit is contained in:
Sol
2015-10-20 23:43:18 +00:00
parent d73b421c28
commit 8b3fadaead

View File

@@ -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) {