From 2e46fb9deb0f0df68364ea714a583fae3d0f65e2 Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Sun, 17 Jul 2016 12:44:00 -0700 Subject: [PATCH] use TargetEnchantmentPermanent --- Mage.Sets/src/mage/cards/a/AbsolverThrull.java | 7 ++----- Mage.Sets/src/mage/cards/a/Allay.java | 5 ++--- Mage.Sets/src/mage/cards/a/AuraFracture.java | 5 ++--- Mage.Sets/src/mage/cards/a/AuraMutation.java | 5 ++--- Mage.Sets/src/mage/cards/a/AvenCloudchaser.java | 5 ++--- Mage.Sets/src/mage/cards/c/Clear.java | 5 ++--- Mage.Sets/src/mage/cards/c/CloudchaserEagle.java | 5 ++--- Mage.Sets/src/mage/cards/c/Cursebreak.java | 5 ++--- Mage.Sets/src/mage/cards/d/DawnToDusk.java | 5 ++--- Mage.Sets/src/mage/cards/d/Demystify.java | 5 ++--- Mage.Sets/src/mage/cards/d/DruidLyrist.java | 7 ++----- Mage.Sets/src/mage/cards/d/DuergarHedgeMage.java | 5 ++--- Mage.Sets/src/mage/cards/e/EchoingCalm.java | 5 ++--- Mage.Sets/src/mage/cards/e/ElfReplica.java | 5 ++--- Mage.Sets/src/mage/cards/e/ElvishHexhunter.java | 5 ++--- Mage.Sets/src/mage/cards/e/ElvishLyrist.java | 5 ++--- Mage.Sets/src/mage/cards/e/EnlightenedAscetic.java | 4 ++-- Mage.Sets/src/mage/cards/e/Erase.java | 5 ++--- Mage.Sets/src/mage/cards/e/EsperCharm.java | 5 ++--- Mage.Sets/src/mage/cards/f/FranticPurification.java | 5 ++--- Mage.Sets/src/mage/cards/g/GolgariCharm.java | 5 ++--- Mage.Sets/src/mage/cards/h/HullBreach.java | 4 +--- Mage.Sets/src/mage/cards/k/KamiOfAncientLaw.java | 5 ++--- Mage.Sets/src/mage/cards/k/KeeningApparition.java | 5 ++--- Mage.Sets/src/mage/cards/k/KithkinSpellduster.java | 5 ++--- Mage.Sets/src/mage/cards/m/MonkRealist.java | 7 ++----- Mage.Sets/src/mage/cards/n/NikkoOnna.java | 5 ++--- Mage.Sets/src/mage/cards/p/PriestOfIroas.java | 7 ++----- Mage.Sets/src/mage/cards/q/QuagmireDruid.java | 5 ++--- Mage.Sets/src/mage/cards/q/QuietPurity.java | 5 ++--- Mage.Sets/src/mage/cards/r/RainOfThorns.java | 9 ++++----- Mage.Sets/src/mage/cards/r/RayOfDissolution.java | 7 ++----- Mage.Sets/src/mage/cards/r/RayOfRevelation.java | 5 ++--- Mage.Sets/src/mage/cards/s/Scour.java | 5 ++--- Mage.Sets/src/mage/cards/s/Shinewend.java | 5 ++--- Mage.Sets/src/mage/cards/s/SilverchaseFox.java | 5 ++--- Mage.Sets/src/mage/cards/w/WarPriestOfThune.java | 7 ++----- Mage.Sets/src/mage/cards/w/WearTear.java | 5 ++--- Mage.Sets/src/mage/cards/w/WipeClean.java | 5 ++--- Mage.Sets/src/mage/cards/w/Wispmare.java | 7 ++----- 40 files changed, 81 insertions(+), 135 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AbsolverThrull.java b/Mage.Sets/src/mage/cards/a/AbsolverThrull.java index 600c4dbed81..bdc2559b42e 100644 --- a/Mage.Sets/src/mage/cards/a/AbsolverThrull.java +++ b/Mage.Sets/src/mage/cards/a/AbsolverThrull.java @@ -35,9 +35,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.HauntAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.Target; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -56,8 +54,7 @@ public class AbsolverThrull extends CardImpl { // Haunt (When this creature dies, exile it haunting target creature.) // When Absolver Thrull enters the battlefield or the creature it haunts dies, destroy target enchantment. Ability ability = new HauntAbility(this, new DestroyTargetEffect()); - Target target = new TargetPermanent(new FilterEnchantmentPermanent()); - ability.addTarget(target); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/Allay.java b/Mage.Sets/src/mage/cards/a/Allay.java index ab1f999ee50..84d4b3dcc9c 100644 --- a/Mage.Sets/src/mage/cards/a/Allay.java +++ b/Mage.Sets/src/mage/cards/a/Allay.java @@ -33,8 +33,7 @@ import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -49,7 +48,7 @@ public class Allay extends CardImpl { this.addAbility(new BuybackAbility("{3}")); // Destroy target enchantment. - this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/cards/a/AuraFracture.java b/Mage.Sets/src/mage/cards/a/AuraFracture.java index 0c58b2b7ab6..d47f8172506 100644 --- a/Mage.Sets/src/mage/cards/a/AuraFracture.java +++ b/Mage.Sets/src/mage/cards/a/AuraFracture.java @@ -37,9 +37,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -55,7 +54,7 @@ public class AuraFracture extends CardImpl { Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent("land")))); - ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AuraMutation.java b/Mage.Sets/src/mage/cards/a/AuraMutation.java index 5ccd33f9c93..011d9dc6983 100644 --- a/Mage.Sets/src/mage/cards/a/AuraMutation.java +++ b/Mage.Sets/src/mage/cards/a/AuraMutation.java @@ -34,9 +34,8 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; import mage.game.permanent.token.SaprolingToken; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -50,7 +49,7 @@ public class AuraMutation extends CardImpl { // Destroy target enchantment. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); // create X 1/1 green Saproling creature tokens, where X is that enchantment's converted mana cost. this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new TargetConvertedManaCost())); } diff --git a/Mage.Sets/src/mage/cards/a/AvenCloudchaser.java b/Mage.Sets/src/mage/cards/a/AvenCloudchaser.java index 3ad615aca1e..cb06cbb857f 100644 --- a/Mage.Sets/src/mage/cards/a/AvenCloudchaser.java +++ b/Mage.Sets/src/mage/cards/a/AvenCloudchaser.java @@ -36,8 +36,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -54,7 +53,7 @@ public class AvenCloudchaser extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/Clear.java b/Mage.Sets/src/mage/cards/c/Clear.java index fc6688bad56..296d7dd8d94 100644 --- a/Mage.Sets/src/mage/cards/c/Clear.java +++ b/Mage.Sets/src/mage/cards/c/Clear.java @@ -35,8 +35,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -48,7 +47,7 @@ public class Clear extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}"); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CloudchaserEagle.java b/Mage.Sets/src/mage/cards/c/CloudchaserEagle.java index 0e406646766..32a2774c640 100644 --- a/Mage.Sets/src/mage/cards/c/CloudchaserEagle.java +++ b/Mage.Sets/src/mage/cards/c/CloudchaserEagle.java @@ -36,8 +36,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -53,7 +52,7 @@ public class CloudchaserEagle extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/Cursebreak.java b/Mage.Sets/src/mage/cards/c/Cursebreak.java index cbeaf6fd229..1bc8286cfe9 100644 --- a/Mage.Sets/src/mage/cards/c/Cursebreak.java +++ b/Mage.Sets/src/mage/cards/c/Cursebreak.java @@ -32,8 +32,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; import java.util.UUID; @@ -47,7 +46,7 @@ public class Cursebreak extends CardImpl { // Destroy target enchantment. You gain 2 life. - this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new GainLifeEffect(2)); } diff --git a/Mage.Sets/src/mage/cards/d/DawnToDusk.java b/Mage.Sets/src/mage/cards/d/DawnToDusk.java index 4a05cf7f094..f360ba09a08 100644 --- a/Mage.Sets/src/mage/cards/d/DawnToDusk.java +++ b/Mage.Sets/src/mage/cards/d/DawnToDusk.java @@ -35,10 +35,9 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterCard; -import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; -import mage.target.TargetPermanent; import mage.target.common.TargetCardInYourGraveyard; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -64,7 +63,7 @@ public class DawnToDusk extends CardImpl { // and/or destroy target enchantment. Mode mode = new Mode(); mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent(new FilterEnchantmentPermanent())); + mode.getTargets().add(new TargetEnchantmentPermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/d/Demystify.java b/Mage.Sets/src/mage/cards/d/Demystify.java index 148b3bab928..cf7ee225929 100644 --- a/Mage.Sets/src/mage/cards/d/Demystify.java +++ b/Mage.Sets/src/mage/cards/d/Demystify.java @@ -33,8 +33,7 @@ import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -46,7 +45,7 @@ public class Demystify extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}"); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); } public Demystify (final Demystify card) { diff --git a/Mage.Sets/src/mage/cards/d/DruidLyrist.java b/Mage.Sets/src/mage/cards/d/DruidLyrist.java index 6f3f4877e8f..cf4e47b8f53 100644 --- a/Mage.Sets/src/mage/cards/d/DruidLyrist.java +++ b/Mage.Sets/src/mage/cards/d/DruidLyrist.java @@ -39,9 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.Target; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -61,8 +59,7 @@ public class DruidLyrist extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - Target target = new TargetPermanent(new FilterEnchantmentPermanent()); - ability.addTarget(target); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DuergarHedgeMage.java b/Mage.Sets/src/mage/cards/d/DuergarHedgeMage.java index f2ccf9088ca..a877b521465 100644 --- a/Mage.Sets/src/mage/cards/d/DuergarHedgeMage.java +++ b/Mage.Sets/src/mage/cards/d/DuergarHedgeMage.java @@ -38,11 +38,10 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -75,7 +74,7 @@ public class DuergarHedgeMage extends CardImpl { // When Duergar Hedge-Mage enters the battlefield, if you control two or more Plains, you may destroy target enchantment. Ability ability2 = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true), new PermanentsOnTheBattlefieldCondition(filter2, CountType.MORE_THAN, 1), rule2); - ability2.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability2.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/e/EchoingCalm.java b/Mage.Sets/src/mage/cards/e/EchoingCalm.java index 3b2feaa81a3..6c8809362ae 100644 --- a/Mage.Sets/src/mage/cards/e/EchoingCalm.java +++ b/Mage.Sets/src/mage/cards/e/EchoingCalm.java @@ -34,11 +34,10 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.filter.common.FilterEnchantmentPermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @author Loki @@ -50,7 +49,7 @@ public class EchoingCalm extends CardImpl { // Destroy target enchantment and all other enchantments with the same name as that enchantment. - this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addEffect(new EchoingCalmEffect()); } diff --git a/Mage.Sets/src/mage/cards/e/ElfReplica.java b/Mage.Sets/src/mage/cards/e/ElfReplica.java index d1b9fafa35f..87a8ae9c70e 100644 --- a/Mage.Sets/src/mage/cards/e/ElfReplica.java +++ b/Mage.Sets/src/mage/cards/e/ElfReplica.java @@ -39,8 +39,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Zone; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -55,7 +54,7 @@ public class ElfReplica extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{G}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java b/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java index 024424ff600..afbc477f629 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHexhunter.java @@ -39,8 +39,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -60,7 +59,7 @@ public class ElvishHexhunter extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G/W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishLyrist.java b/Mage.Sets/src/mage/cards/e/ElvishLyrist.java index f183c90bbc4..803c073d637 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishLyrist.java +++ b/Mage.Sets/src/mage/cards/e/ElvishLyrist.java @@ -40,8 +40,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Zone; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -60,7 +59,7 @@ public class ElvishLyrist extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EnlightenedAscetic.java b/Mage.Sets/src/mage/cards/e/EnlightenedAscetic.java index 594a8b5a76a..3e349dcfe84 100644 --- a/Mage.Sets/src/mage/cards/e/EnlightenedAscetic.java +++ b/Mage.Sets/src/mage/cards/e/EnlightenedAscetic.java @@ -38,6 +38,7 @@ import mage.constants.CardType; import mage.filter.common.FilterEnchantmentPermanent; import mage.target.Target; import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -54,8 +55,7 @@ public class EnlightenedAscetic extends CardImpl { // When Enlightened Ascetic enters the battlefield, you may destroy target enchantment. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true); - Target target = new TargetPermanent(new FilterEnchantmentPermanent()); - ability.addTarget(target); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/Erase.java b/Mage.Sets/src/mage/cards/e/Erase.java index ad4c003acef..ed905a06fc7 100644 --- a/Mage.Sets/src/mage/cards/e/Erase.java +++ b/Mage.Sets/src/mage/cards/e/Erase.java @@ -32,8 +32,7 @@ import mage.constants.CardType; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -46,7 +45,7 @@ public class Erase extends CardImpl { // Exile target enchantment. this.getSpellAbility().addEffect(new ExileTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); } public Erase(final Erase card) { diff --git a/Mage.Sets/src/mage/cards/e/EsperCharm.java b/Mage.Sets/src/mage/cards/e/EsperCharm.java index 71ea2fcfe4e..3d043ffb540 100644 --- a/Mage.Sets/src/mage/cards/e/EsperCharm.java +++ b/Mage.Sets/src/mage/cards/e/EsperCharm.java @@ -35,9 +35,8 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; import mage.target.TargetPlayer; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -51,7 +50,7 @@ public class EsperCharm extends CardImpl { // Choose one - Destroy target enchantment; this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); // or draw two cards; Mode mode = new Mode(); mode.getEffects().add(new DrawCardSourceControllerEffect(2)); diff --git a/Mage.Sets/src/mage/cards/f/FranticPurification.java b/Mage.Sets/src/mage/cards/f/FranticPurification.java index 1c1bca63cdb..9c540994aeb 100644 --- a/Mage.Sets/src/mage/cards/f/FranticPurification.java +++ b/Mage.Sets/src/mage/cards/f/FranticPurification.java @@ -33,8 +33,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; import java.util.UUID; @@ -50,7 +49,7 @@ public class FranticPurification extends CardImpl { // Destroy target enchantment. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); // Madness {W} this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{W}"))); diff --git a/Mage.Sets/src/mage/cards/g/GolgariCharm.java b/Mage.Sets/src/mage/cards/g/GolgariCharm.java index e147121fc13..0221e9aa6cd 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariCharm.java +++ b/Mage.Sets/src/mage/cards/g/GolgariCharm.java @@ -38,8 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -57,7 +56,7 @@ public class GolgariCharm extends CardImpl { // or destroy target enchantment; Mode mode = new Mode(); mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent(new FilterEnchantmentPermanent())); + mode.getTargets().add(new TargetEnchantmentPermanent()); this.getSpellAbility().addMode(mode); // or regenerate each creature you control. diff --git a/Mage.Sets/src/mage/cards/h/HullBreach.java b/Mage.Sets/src/mage/cards/h/HullBreach.java index 87818835d94..756d2d6dbe0 100644 --- a/Mage.Sets/src/mage/cards/h/HullBreach.java +++ b/Mage.Sets/src/mage/cards/h/HullBreach.java @@ -34,9 +34,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.common.FilterEnchantmentPermanent; import mage.target.Target; -import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetEnchantmentPermanent; @@ -56,7 +54,7 @@ public class HullBreach extends CardImpl { // or destroy target enchantment; Mode mode = new Mode(); mode.getEffects().add(new DestroyTargetEffect()); - target = new TargetPermanent(new FilterEnchantmentPermanent()); + target = new TargetEnchantmentPermanent(); mode.getTargets().add(target); this.getSpellAbility().addMode(mode); // or destroy target artifact and target enchantment. diff --git a/Mage.Sets/src/mage/cards/k/KamiOfAncientLaw.java b/Mage.Sets/src/mage/cards/k/KamiOfAncientLaw.java index b06ddb9214c..20c67a7ff1d 100644 --- a/Mage.Sets/src/mage/cards/k/KamiOfAncientLaw.java +++ b/Mage.Sets/src/mage/cards/k/KamiOfAncientLaw.java @@ -39,8 +39,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Zone; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -55,7 +54,7 @@ public class KamiOfAncientLaw extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KeeningApparition.java b/Mage.Sets/src/mage/cards/k/KeeningApparition.java index d42ee4678ee..f94e48ade38 100644 --- a/Mage.Sets/src/mage/cards/k/KeeningApparition.java +++ b/Mage.Sets/src/mage/cards/k/KeeningApparition.java @@ -37,8 +37,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @author LevelX2 @@ -54,7 +53,7 @@ public class KeeningApparition extends CardImpl { // Sacrifice Keening Apparition: Destroy target enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(),new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KithkinSpellduster.java b/Mage.Sets/src/mage/cards/k/KithkinSpellduster.java index efcd607155b..7719492eb69 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinSpellduster.java +++ b/Mage.Sets/src/mage/cards/k/KithkinSpellduster.java @@ -41,8 +41,7 @@ import mage.abilities.keyword.PersistAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Zone; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -62,7 +61,7 @@ public class KithkinSpellduster extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{W}, Sacrifice Kithkin Spellduster: Destroy target enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}")); - ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability.addTarget(new TargetEnchantmentPermanent()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); // Persist diff --git a/Mage.Sets/src/mage/cards/m/MonkRealist.java b/Mage.Sets/src/mage/cards/m/MonkRealist.java index bcd1520c763..d74def025ec 100644 --- a/Mage.Sets/src/mage/cards/m/MonkRealist.java +++ b/Mage.Sets/src/mage/cards/m/MonkRealist.java @@ -35,9 +35,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.Target; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -55,8 +53,7 @@ public class MonkRealist extends CardImpl { // When Monk Realist enters the battlefield, destroy target enchantment. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - Target target = new TargetPermanent(new FilterEnchantmentPermanent()); - ability.addTarget(target); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NikkoOnna.java b/Mage.Sets/src/mage/cards/n/NikkoOnna.java index 6e779675c21..0cd88b001eb 100644 --- a/Mage.Sets/src/mage/cards/n/NikkoOnna.java +++ b/Mage.Sets/src/mage/cards/n/NikkoOnna.java @@ -37,9 +37,8 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.common.FilterSpiritOrArcaneCard; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -56,7 +55,7 @@ public class NikkoOnna extends CardImpl { // When Nikko-Onna enters the battlefield, destroy target enchantment. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); // Whenever you cast a Spirit or Arcane spell, you may return Nikko-Onna to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/p/PriestOfIroas.java b/Mage.Sets/src/mage/cards/p/PriestOfIroas.java index ed13498118b..9f47687de28 100644 --- a/Mage.Sets/src/mage/cards/p/PriestOfIroas.java +++ b/Mage.Sets/src/mage/cards/p/PriestOfIroas.java @@ -38,9 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.Target; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -59,8 +57,7 @@ public class PriestOfIroas extends CardImpl { // {3}{W}, Sacrifice Priest of Iroas: Destroy target enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{W}")); ability.addCost(new SacrificeSourceCost()); - Target target = new TargetPermanent(new FilterEnchantmentPermanent()); - ability.addTarget(target); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/q/QuagmireDruid.java b/Mage.Sets/src/mage/cards/q/QuagmireDruid.java index 91257baf008..841e64c69fb 100644 --- a/Mage.Sets/src/mage/cards/q/QuagmireDruid.java +++ b/Mage.Sets/src/mage/cards/q/QuagmireDruid.java @@ -41,9 +41,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -63,7 +62,7 @@ public class QuagmireDruid extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(false), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); - ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/q/QuietPurity.java b/Mage.Sets/src/mage/cards/q/QuietPurity.java index 0238eaf31ec..c862381e860 100644 --- a/Mage.Sets/src/mage/cards/q/QuietPurity.java +++ b/Mage.Sets/src/mage/cards/q/QuietPurity.java @@ -34,8 +34,7 @@ import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @author Loki @@ -46,7 +45,7 @@ public class QuietPurity extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}"); this.subtype.add("Arcane"); - this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/cards/r/RainOfThorns.java b/Mage.Sets/src/mage/cards/r/RainOfThorns.java index f3efb74d5e6..35dc7d3b05a 100644 --- a/Mage.Sets/src/mage/cards/r/RainOfThorns.java +++ b/Mage.Sets/src/mage/cards/r/RainOfThorns.java @@ -32,10 +32,9 @@ import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.common.FilterLandPermanent; -import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; +import mage.target.common.TargetEnchantmentPermanent; +import mage.target.common.TargetLandPermanent; import java.util.UUID; @@ -58,12 +57,12 @@ public class RainOfThorns extends CardImpl { Mode mode1 = new Mode(); mode1.getEffects().add(new DestroyTargetEffect()); - mode1.getTargets().add(new TargetPermanent(new FilterEnchantmentPermanent())); + mode1.getTargets().add(new TargetEnchantmentPermanent()); this.getSpellAbility().addMode(mode1); Mode mode2 = new Mode(); mode2.getEffects().add(new DestroyTargetEffect()); - mode2.getTargets().add(new TargetPermanent(new FilterLandPermanent())); + mode2.getTargets().add(new TargetLandPermanent()); this.getSpellAbility().addMode(mode2); } diff --git a/Mage.Sets/src/mage/cards/r/RayOfDissolution.java b/Mage.Sets/src/mage/cards/r/RayOfDissolution.java index 01c025afc89..7a30e93456a 100644 --- a/Mage.Sets/src/mage/cards/r/RayOfDissolution.java +++ b/Mage.Sets/src/mage/cards/r/RayOfDissolution.java @@ -33,9 +33,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.Target; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -49,8 +47,7 @@ public class RayOfDissolution extends CardImpl { // Destroy target enchantment. You gain 3 life. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - Target target = new TargetPermanent(new FilterEnchantmentPermanent()); - this.getSpellAbility().addTarget(target); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addEffect(new GainLifeEffect(3)); } diff --git a/Mage.Sets/src/mage/cards/r/RayOfRevelation.java b/Mage.Sets/src/mage/cards/r/RayOfRevelation.java index b3029e6f9e3..cc707be9a66 100644 --- a/Mage.Sets/src/mage/cards/r/RayOfRevelation.java +++ b/Mage.Sets/src/mage/cards/r/RayOfRevelation.java @@ -35,8 +35,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -49,7 +48,7 @@ public class RayOfRevelation extends CardImpl { // Destroy target enchantment. - this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); // Flashback {G} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{G}"), TimingRule.INSTANT)); diff --git a/Mage.Sets/src/mage/cards/s/Scour.java b/Mage.Sets/src/mage/cards/s/Scour.java index 289e0ddaa54..582a874b15c 100644 --- a/Mage.Sets/src/mage/cards/s/Scour.java +++ b/Mage.Sets/src/mage/cards/s/Scour.java @@ -32,8 +32,7 @@ import mage.constants.CardType; import mage.abilities.effects.common.ExileTargetAndSearchGraveyardHandLibraryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -47,7 +46,7 @@ public class Scour extends CardImpl { // Exile target enchantment. // Search its controller's graveyard, hand, and library for all cards with the same name as that enchantment and exile them. Then that player shuffles his or her library. - this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's","all cards with the same name as that enchantment")); } diff --git a/Mage.Sets/src/mage/cards/s/Shinewend.java b/Mage.Sets/src/mage/cards/s/Shinewend.java index 37ba39179e2..04f6d5b742f 100644 --- a/Mage.Sets/src/mage/cards/s/Shinewend.java +++ b/Mage.Sets/src/mage/cards/s/Shinewend.java @@ -43,8 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Zone; import mage.counters.CounterType; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -68,7 +67,7 @@ public class Shinewend extends CardImpl { // {1}{W}, Remove a +1/+1 counter from Shinewend: Destroy target enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); - ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SilverchaseFox.java b/Mage.Sets/src/mage/cards/s/SilverchaseFox.java index e5216c4c4ae..98c99355966 100644 --- a/Mage.Sets/src/mage/cards/s/SilverchaseFox.java +++ b/Mage.Sets/src/mage/cards/s/SilverchaseFox.java @@ -37,8 +37,7 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Zone; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; import java.util.UUID; @@ -56,7 +55,7 @@ public class SilverchaseFox extends CardImpl { // {1}{W}, Sacrifice Silverchase Fox: Exile target enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{1}{W}")); - ability.addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + ability.addTarget(new TargetEnchantmentPermanent()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WarPriestOfThune.java b/Mage.Sets/src/mage/cards/w/WarPriestOfThune.java index 1eb1cd277c7..285b0bcecc7 100644 --- a/Mage.Sets/src/mage/cards/w/WarPriestOfThune.java +++ b/Mage.Sets/src/mage/cards/w/WarPriestOfThune.java @@ -36,9 +36,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.Target; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -56,8 +54,7 @@ public class WarPriestOfThune extends CardImpl { // When War Priest of Thune enters the battlefield, you may destroy target enchantment. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true); - Target target = new TargetPermanent(new FilterEnchantmentPermanent()); - ability.addTarget(target); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WearTear.java b/Mage.Sets/src/mage/cards/w/WearTear.java index 54b73cbc729..4e7fa9aac17 100644 --- a/Mage.Sets/src/mage/cards/w/WearTear.java +++ b/Mage.Sets/src/mage/cards/w/WearTear.java @@ -32,10 +32,9 @@ import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardSetInfo; import mage.cards.SplitCard; -import mage.filter.common.FilterEnchantmentPermanent; import mage.target.Target; -import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -55,7 +54,7 @@ public class WearTear extends SplitCard { // Tear // Destroy target enchantment. getRightHalfCard().getSpellAbility().addEffect(new DestroyTargetEffect()); - target = new TargetPermanent(new FilterEnchantmentPermanent()); + target = new TargetEnchantmentPermanent(); getRightHalfCard().getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/cards/w/WipeClean.java b/Mage.Sets/src/mage/cards/w/WipeClean.java index 57e127c6b78..7dce6709bd0 100644 --- a/Mage.Sets/src/mage/cards/w/WipeClean.java +++ b/Mage.Sets/src/mage/cards/w/WipeClean.java @@ -34,8 +34,7 @@ import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -47,7 +46,7 @@ public class WipeClean extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}"); // Exile target enchantment. - this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addEffect(new ExileTargetEffect()); // Cycling {3} this.addAbility(new CyclingAbility(new ManaCostsImpl("{3}"))); diff --git a/Mage.Sets/src/mage/cards/w/Wispmare.java b/Mage.Sets/src/mage/cards/w/Wispmare.java index 1cffcb05de4..6622ef0690f 100644 --- a/Mage.Sets/src/mage/cards/w/Wispmare.java +++ b/Mage.Sets/src/mage/cards/w/Wispmare.java @@ -37,9 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.EvokeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.filter.common.FilterEnchantmentPermanent; -import mage.target.Target; -import mage.target.TargetPermanent; +import mage.target.common.TargetEnchantmentPermanent; /** * @@ -58,8 +56,7 @@ public class Wispmare extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Wispmare enters the battlefield, destroy target enchantment. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect()); - Target target = new TargetPermanent(new FilterEnchantmentPermanent()); - ability.addTarget(target); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); // Evoke {W} this.addAbility(new EvokeAbility(this, "{W}"));