From 2ee5f223fe043bfd6c2b4500c8612e039faa5a0e Mon Sep 17 00:00:00 2001 From: JRHerlehy Date: Tue, 13 Dec 2016 15:27:55 -0800 Subject: [PATCH 1/3] [AER] Fix Consulate Crackdown to use TargetController.OPPONENT instead of TargetController.NOT_YOU --- Mage.Sets/src/mage/cards/c/ConsulateCrackdown.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/c/ConsulateCrackdown.java b/Mage.Sets/src/mage/cards/c/ConsulateCrackdown.java index 0e81fc0ed0a..7fd30a932b1 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulateCrackdown.java +++ b/Mage.Sets/src/mage/cards/c/ConsulateCrackdown.java @@ -77,7 +77,7 @@ class ConsulateCracksownExileEffect extends OneShotEffect { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifacts your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(new ControllerPredicate(TargetController.OPPONENT)); } public ConsulateCracksownExileEffect() { From ce8befffdd180a5e773b5b02170c39f0e0e925ee Mon Sep 17 00:00:00 2001 From: spjspj Date: Thu, 15 Dec 2016 16:51:05 +1100 Subject: [PATCH 2/3] spjspj - Evolutionary Escalation fix (C16) --- Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java b/Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java index 52f60f0a15d..322929d6315 100644 --- a/Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java +++ b/Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java @@ -39,6 +39,7 @@ import mage.constants.TargetController; import mage.counters.Counter; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; @@ -51,6 +52,10 @@ import mage.target.common.TargetCreaturePermanent; */ public class EvolutionaryEscalation extends CardImpl { private static final FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls"); + + static { + filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT)); + } public EvolutionaryEscalation(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); From 9c6b9073a8167f0d1062c594a21272e3fb2bfdb7 Mon Sep 17 00:00:00 2001 From: spjspj Date: Thu, 15 Dec 2016 20:42:29 +1100 Subject: [PATCH 3/3] spjspj - Eye of the Storm fix --- Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java b/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java index e0193d2bbb2..2e0102c774f 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java @@ -63,7 +63,7 @@ import mage.util.CardUtil; public class EyeOfTheStorm extends CardImpl { public EyeOfTheStorm(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{5}{U}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{5}{U}{U}"); // Whenever a player casts an instant or sorcery card, exile it. Then that player copies each instant or sorcery card exiled with Eye of the Storm. For each copy, the player may cast the copy without paying its mana cost. this.addAbility(new EyeOfTheStormAbility()); @@ -101,7 +101,7 @@ class EyeOfTheStormAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { - if (event.getZone() == Zone.HAND) { + if (event.getZone() != Zone.OUTSIDE) { Spell spell = game.getStack().getSpell(event.getTargetId()); if (spell != null && !spell.isCopy() && (spell.getCardType().contains(CardType.INSTANT) || spell.getCardType().contains(CardType.SORCERY))) {