From cb11dde335d5e5b0a8758825b6da71e4d67b91a7 Mon Sep 17 00:00:00 2001 From: Cowboy Date: Thu, 2 Jan 2014 16:23:10 -0500 Subject: [PATCH] Revised Odyssey cards --- .../src/mage/sets/odyssey/DevotedCaretaker.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java b/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java index dad05739f1a..4ab0302cd5e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java +++ b/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java @@ -40,8 +40,9 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.constants.Zone; -import mage.filter.Filter; -import mage.filter.common.FilterInstantOrSorceryCard; +import mage.filter.FilterSpell; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.Target; import mage.target.common.TargetControlledPermanent; @@ -51,11 +52,11 @@ import mage.target.common.TargetControlledPermanent; */ public class DevotedCaretaker extends CardImpl { - private static final Filter filter = new FilterInstantOrSorceryCard(); - /*static { - filter.add(new CardTypePredicate(CardType.INSTANT)); - filter.add(new CardTypePredicate(CardType.SORCERY)); - }*/ + private static final FilterSpell filter = new FilterSpell("instant spells and sorcery spells"); + + static{ + filter.add(Predicates.or(new CardTypePredicate(CardType.SORCERY), new CardTypePredicate(CardType.INSTANT))); + } public DevotedCaretaker(UUID ownerId) { super(ownerId, 18, "Devoted Caretaker", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{W}");