diff --git a/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java b/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java index 91caa63e32fc..0c5eb50c2698 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java @@ -17,6 +17,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterSpell; +import mage.filter.FilterStackObject; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorlessPredicate; @@ -25,7 +26,7 @@ */ public final class EmrakulTheAeonsTorn extends CardImpl { - private static final FilterSpell filter = new FilterSpell("colored spells"); + private static final FilterStackObject filter = new FilterStackObject("colored spells"); static { filter.add(Predicates.not(ColorlessPredicate.instance)); diff --git a/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java b/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java index b6af39c002e0..167bd5003d57 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java @@ -97,6 +97,12 @@ public boolean canTarget(MageObject source, Game game) { return true; } } + // Emrakul, the Aeons Torn + if (filter instanceof FilterStackObject) { + if (source instanceof Spell) { + return !filter.match(source, game); + } + } if (filter instanceof FilterObject) { return !filter.match(source, game);