diff --git a/Mage.Sets/src/mage/cards/a/ArborElf.java b/Mage.Sets/src/mage/cards/a/ArborElf.java index 4b6c995ced4..5220d7ad9da 100644 --- a/Mage.Sets/src/mage/cards/a/ArborElf.java +++ b/Mage.Sets/src/mage/cards/a/ArborElf.java @@ -39,7 +39,6 @@ import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetLandPermanent; /** @@ -48,11 +47,7 @@ import mage.target.common.TargetLandPermanent; */ public class ArborElf extends CardImpl { - private static final FilterLandPermanent filter = new FilterLandPermanent("Forest"); - - static { - filter.add(new SubtypePredicate("Forest")); - } + private static final FilterLandPermanent filter = new FilterLandPermanent("Forest", "Forest"); public ArborElf(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); diff --git a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java index 2af54f6684b..220cce36e69 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java +++ b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java @@ -42,7 +42,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -53,11 +52,7 @@ import mage.target.common.TargetLandPermanent; */ public class AwakenTheAncient extends CardImpl { - private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain"); - - static { - filter.add(new SubtypePredicate("Mountain")); - } + private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain", "Mountain"); public AwakenTheAncient(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}{R}{R}"); diff --git a/Mage.Sets/src/mage/cards/a/AwakenerDruid.java b/Mage.Sets/src/mage/cards/a/AwakenerDruid.java index 281c7ac256c..93de512dbec 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenerDruid.java +++ b/Mage.Sets/src/mage/cards/a/AwakenerDruid.java @@ -41,7 +41,6 @@ import mage.cards.CardSetInfo; import mage.constants.Layer; import mage.constants.SubLayer; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; @@ -53,11 +52,7 @@ import mage.target.common.TargetLandPermanent; */ public class AwakenerDruid extends CardImpl { - private static final FilterLandPermanent filter = new FilterLandPermanent("Forest"); - - static { - filter.add(new SubtypePredicate("Forest")); - } + private static final FilterLandPermanent filter = new FilterLandPermanent("Forest", "Forest"); public AwakenerDruid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java index 0bc91d2a6a6..1d78a9b295e 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java @@ -45,7 +45,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -56,11 +55,7 @@ import mage.target.common.TargetLandPermanent; */ public class GenjuOfTheCedars extends CardImpl { - private static final FilterLandPermanent filter = new FilterLandPermanent("Forest"); - - static { - filter.add(new SubtypePredicate("Forest")); - } + private static final FilterLandPermanent filter = new FilterLandPermanent("Forest", "Forest"); public GenjuOfTheCedars(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java index fea40585fba..f9e9c3be3fb 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java @@ -45,7 +45,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -56,11 +55,7 @@ import mage.target.common.TargetLandPermanent; */ public class GenjuOfTheFalls extends CardImpl { - private static final FilterLandPermanent FILTER = new FilterLandPermanent("Island"); - - static { - FILTER.add(new SubtypePredicate("Island")); - } + private static final FilterLandPermanent FILTER = new FilterLandPermanent("Island", "Island"); public GenjuOfTheFalls(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}"); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java index 79bc08e1fb5..af0f62f98f2 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java @@ -46,7 +46,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -57,11 +56,7 @@ import mage.target.common.TargetLandPermanent; */ public class GenjuOfTheFens extends CardImpl { - private static final FilterLandPermanent FILTER = new FilterLandPermanent("Swamp"); - - static { - FILTER.add(new SubtypePredicate("Swamp")); - } + private static final FilterLandPermanent FILTER = new FilterLandPermanent("Swamp", "Swamp"); public GenjuOfTheFens(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}"); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java index a497e87b338..086b5bdee55 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java @@ -48,7 +48,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -59,11 +58,7 @@ import mage.target.common.TargetLandPermanent; */ public class GenjuOfTheFields extends CardImpl { - private static final FilterLandPermanent FILTER = new FilterLandPermanent("Plains"); - - static { - FILTER.add(new SubtypePredicate("Plains")); - } + private static final FilterLandPermanent FILTER = new FilterLandPermanent("Plains", "Plains"); public GenjuOfTheFields(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}"); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java index afcb9727156..b0a6bf893cb 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java @@ -44,7 +44,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; -import mage.filter.common.FilterLandPermanent; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -55,15 +54,13 @@ import mage.target.common.TargetLandPermanent; */ public class GenjuOfTheRealm extends CardImpl { - private static final FilterLandPermanent FILTER = new FilterLandPermanent(); - public GenjuOfTheRealm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}{U}{B}{R}{G}"); this.subtype.add("Aura"); this.supertype.add("Legendary"); // Enchant Land - TargetPermanent auraTarget = new TargetLandPermanent(FILTER); + TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java index 9bc825aa70d..a515f077120 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java @@ -44,7 +44,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -55,11 +54,7 @@ import mage.target.common.TargetLandPermanent; */ public class GenjuOfTheSpires extends CardImpl { - private static final FilterLandPermanent FILTER = new FilterLandPermanent("Mountain"); - - static { - FILTER.add(new SubtypePredicate("Mountain")); - } + private static final FilterLandPermanent FILTER = new FilterLandPermanent("Mountain", "Mountain"); public GenjuOfTheSpires(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{R}"); diff --git a/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java b/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java index 7fa86be1efd..70fe2b0978c 100644 --- a/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java +++ b/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java @@ -68,12 +68,10 @@ import mage.target.common.TargetLandPermanent; */ public class KothOfTheHammer extends CardImpl { - static final FilterLandPermanent filter = new FilterLandPermanent("Mountain"); + static final FilterLandPermanent filter = new FilterLandPermanent("Mountain", "Mountain"); static final FilterLandPermanent filterCount = new FilterLandPermanent("Mountain you control"); static { - filter.add(new SubtypePredicate("Mountain")); - filterCount.add(new SubtypePredicate("Mountain")); filterCount.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/l/LivingTerrain.java b/Mage.Sets/src/mage/cards/l/LivingTerrain.java index 3baa350b83c..4cf5431f838 100644 --- a/Mage.Sets/src/mage/cards/l/LivingTerrain.java +++ b/Mage.Sets/src/mage/cards/l/LivingTerrain.java @@ -56,7 +56,7 @@ public class LivingTerrain extends CardImpl { // Enchant land - TargetPermanent auraTarget = new TargetLandPermanent(new FilterLandPermanent()); + TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/cards/n/NissaWorldwaker.java b/Mage.Sets/src/mage/cards/n/NissaWorldwaker.java index 46276cbb93a..19b366b044b 100644 --- a/Mage.Sets/src/mage/cards/n/NissaWorldwaker.java +++ b/Mage.Sets/src/mage/cards/n/NissaWorldwaker.java @@ -48,7 +48,6 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterBasicLandCard; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -66,11 +65,10 @@ import mage.target.targetpointer.FixedTarget; public class NissaWorldwaker extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("land you control"); - private static final FilterPermanent filterForest = new FilterPermanent("Forest"); + private static final FilterPermanent filterForest = new FilterPermanent("Forest", "Forest"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filterForest.add(new SubtypePredicate("Forest")); } public NissaWorldwaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VolcanicEruption.java b/Mage.Sets/src/mage/cards/v/VolcanicEruption.java index 10b3e59ad5c..5b45b976af6 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicEruption.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicEruption.java @@ -39,7 +39,6 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -51,11 +50,7 @@ import mage.target.common.TargetLandPermanent; */ public class VolcanicEruption extends CardImpl { - private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain"); - - static{ - filter.add(new SubtypePredicate(("Mountain"))); - } + private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain", "Mountain"); public VolcanicEruption(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{U}{U}{U}");