diff --git a/Mage.Sets/src/mage/cards/r/ResoundingSilence.java b/Mage.Sets/src/mage/cards/r/ResoundingSilence.java index 99f6127f68d..ff073a50df7 100644 --- a/Mage.Sets/src/mage/cards/r/ResoundingSilence.java +++ b/Mage.Sets/src/mage/cards/r/ResoundingSilence.java @@ -1,4 +1,3 @@ - package mage.cards.r; import java.util.UUID; @@ -10,7 +9,7 @@ import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.common.FilterAttackingCreature; +import mage.filter.StaticFilters; import mage.target.TargetPermanent; import mage.target.common.TargetAttackingCreature; @@ -23,7 +22,6 @@ public final class ResoundingSilence extends CardImpl { public ResoundingSilence(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{W}"); - // Exile target attacking creature. this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetAttackingCreature()); @@ -31,7 +29,7 @@ public final class ResoundingSilence extends CardImpl { this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{G}{W}{U}"))); // When you cycle Resounding Silence, exile up to two target attacking creatures. Ability ability = new CycleTriggeredAbility(new ExileTargetEffect()); - TargetPermanent target = new TargetAttackingCreature(0, 2, new FilterAttackingCreature("up to two target attacking creatures"), false); + TargetPermanent target = new TargetAttackingCreature(0, 2, StaticFilters.FILTER_ATTACKING_CREATURES, false); ability.addTarget(target); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/ResoundingWave.java b/Mage.Sets/src/mage/cards/r/ResoundingWave.java index e022446a18d..33c7eef4a0c 100644 --- a/Mage.Sets/src/mage/cards/r/ResoundingWave.java +++ b/Mage.Sets/src/mage/cards/r/ResoundingWave.java @@ -1,4 +1,3 @@ - package mage.cards.r; import java.util.UUID; @@ -10,7 +9,7 @@ import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.FilterPermanent; +import mage.filter.StaticFilters; import mage.target.TargetPermanent; /** @@ -30,7 +29,7 @@ public final class ResoundingWave extends CardImpl { this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{W}{U}{B}"))); // When you cycle Resounding Wave, return two target permanents to their owners' hands. Ability ability = new CycleTriggeredAbility(new ReturnToHandTargetEffect()); - TargetPermanent target = new TargetPermanent(2, new FilterPermanent("two target permanents")); + TargetPermanent target = new TargetPermanent(2, StaticFilters.FILTER_PERMANENTS); ability.addTarget(target); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java index a07c45be463..44278b896d9 100644 --- a/Mage/src/main/java/mage/filter/StaticFilters.java +++ b/Mage/src/main/java/mage/filter/StaticFilters.java @@ -12,7 +12,6 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.KickedSpellPredicate; import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.filter.predicate.other.AnotherTargetPredicate; -import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -751,10 +750,9 @@ public final class StaticFilters { FILTER_CREATURE_TOKENS.setLockedFilter(true); } - public static final FilterCreaturePermanent FILTER_ATTACKING_CREATURES = new FilterCreaturePermanent("attacking creatures"); + public static final FilterAttackingCreature FILTER_ATTACKING_CREATURES = new FilterAttackingCreature("attacking creatures"); static { - FILTER_ATTACKING_CREATURES.add(AttackingPredicate.instance); FILTER_ATTACKING_CREATURES.setLockedFilter(true); }