diff --git a/Mage.Sets/src/mage/cards/w/WormfangNewt.java b/Mage.Sets/src/mage/cards/w/WormfangNewt.java index cffc8262179..70a40fd8a78 100644 --- a/Mage.Sets/src/mage/cards/w/WormfangNewt.java +++ b/Mage.Sets/src/mage/cards/w/WormfangNewt.java @@ -13,6 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; +import mage.filter.StaticFilters; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.Target; @@ -22,11 +23,6 @@ import mage.target.TargetPermanent; * @author tcontis */ public final class WormfangNewt extends CardImpl { - private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent(); - - static { - filter.add(AnotherPredicate.instance); - } public WormfangNewt(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); @@ -39,7 +35,8 @@ public final class WormfangNewt extends CardImpl { // When Wormfang Turtle enters the battlefield, exile a land you control. Ability ability1 = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect(), false); - Target target = new TargetPermanent(filter); + Target target = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_A_LAND); + target.setNotTarget(true); ability1.addTarget(target); this.addAbility(ability1); diff --git a/Mage.Sets/src/mage/cards/w/WormfangTurtle.java b/Mage.Sets/src/mage/cards/w/WormfangTurtle.java index 2b79abb22f7..f1912640f3b 100644 --- a/Mage.Sets/src/mage/cards/w/WormfangTurtle.java +++ b/Mage.Sets/src/mage/cards/w/WormfangTurtle.java @@ -13,6 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; +import mage.filter.StaticFilters; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.Target; @@ -22,11 +23,6 @@ import mage.target.TargetPermanent; * @author tcontis */ public final class WormfangTurtle extends CardImpl { - private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent(); - - static { - filter.add(AnotherPredicate.instance); - } public WormfangTurtle(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); @@ -39,7 +35,8 @@ public final class WormfangTurtle extends CardImpl { // When Wormfang Turtle enters the battlefield, exile a land you control. Ability ability1 = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect(), false); - Target target = new TargetPermanent(filter); + Target target = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_A_LAND); + target.setNotTarget(true); ability1.addTarget(target); this.addAbility(ability1); diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java index d684d973645..1b6b2c4da78 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java @@ -101,25 +101,6 @@ public class ExileTargetForSourceEffect extends OneShotEffect { if (staticText != null && !staticText.isEmpty()) { return staticText; } - - String amountText = ""; - if (mode.getTargets().get(0).getMinNumberOfTargets() < mode.getTargets().get(0).getMaxNumberOfTargets()) { - amountText = "up to " + CardUtil.numberToText(mode.getTargets().get(0).getMaxNumberOfTargets()) + " "; - } else if (mode.getTargets().get(0).getMinNumberOfTargets() > 1) { - amountText = CardUtil.numberToText(mode.getTargets().get(0).getMinNumberOfTargets()) + " "; - } - - String targetText = ""; - if (mode.getTargets().get(0).getTargetName().contains("target ")) { - targetText = ""; - } else { - targetText = "target "; - } - - if (mode.getTargets().isEmpty()) { - return "exile it"; - } else { - return "exile " + amountText + targetText + mode.getTargets().get(0).getTargetName(); - } + return "exile " + getTargetPointer().describeTargets(mode.getTargets(), "it"); } }