From c10c4da9bf160b891c77e11291d4f0d3e7683ea3 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 30 Sep 2013 11:22:06 +0200 Subject: [PATCH] * Fixed import of Dirty Wererat (cbt33). --- Mage.Sets/src/mage/sets/odyssey/CeaseFire.java | 12 ++++++++++-- Mage.Sets/src/mage/sets/odyssey/DirtyWererat.java | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java b/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java index cf7ea830440..365e2ea92eb 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java +++ b/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java @@ -37,8 +37,11 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Rarity; +import mage.filter.FilterSpell; +import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; import mage.game.events.GameEvent; +import mage.game.stack.Spell; import mage.target.TargetPlayer; /** @@ -72,7 +75,12 @@ public class CeaseFire extends CardImpl { } class CeaseFireEffect extends ReplacementEffectImpl { - + + private static final FilterSpell filter = new FilterSpell(); + static { + filter.add(new CardTypePredicate(CardType.CREATURE)); + } + public CeaseFireEffect() { super(Duration.EndOfTurn, Outcome.Detriment); staticText = "Target player can't cast creature spells."; @@ -101,7 +109,7 @@ class CeaseFireEffect extends ReplacementEffectImpl { public boolean applies(GameEvent event, Ability source, Game game) { if (event.getType() == GameEvent.EventType.CAST_SPELL && event.getPlayerId().equals(source.getFirstTarget())) { MageObject object = game.getObject(event.getSourceId()); - if (object.getCardType().contains(CardType.CREATURE)) { + if (filter.match((Spell) object, game)) { return true; } } diff --git a/Mage.Sets/src/mage/sets/odyssey/DirtyWererat.java b/Mage.Sets/src/mage/sets/odyssey/DirtyWererat.java index 18d52c1de0e..9ba5823746c 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DirtyWererat.java +++ b/Mage.Sets/src/mage/sets/odyssey/DirtyWererat.java @@ -36,8 +36,8 @@ import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinousEffect; -import mage.abilities.effects.common.CantBlockSourceEffect; import mage.abilities.effects.common.RegenerateSourceEffect; +import mage.abilities.effects.common.combat.CantBlockSourceEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; import mage.constants.CardType;