diff --git a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java index 108c8d3ea8f..d6ee3adf34b 100644 --- a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java +++ b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java @@ -27,7 +27,7 @@ public final class AcidSpewerDragon extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other Dragon creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.DRAGON)); } diff --git a/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java b/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java index 58241914141..4c8c7bc6cc9 100644 --- a/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java +++ b/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java @@ -34,7 +34,7 @@ public final class AdarkarValkyrie extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AdarkarValkyrie(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java b/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java index a969bbc9895..2490d280e41 100644 --- a/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java +++ b/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java @@ -30,7 +30,7 @@ public final class AdmonitionAngel extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("nonland permanent other than Admonition Angel"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new CardTypePredicate(CardType.LAND))); } diff --git a/Mage.Sets/src/mage/cards/a/AegisAngel.java b/Mage.Sets/src/mage/cards/a/AegisAngel.java index 4750a5d59cb..7222995d67c 100644 --- a/Mage.Sets/src/mage/cards/a/AegisAngel.java +++ b/Mage.Sets/src/mage/cards/a/AegisAngel.java @@ -27,7 +27,7 @@ public final class AegisAngel extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another target permanent"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AegisAngel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AegisAutomaton.java b/Mage.Sets/src/mage/cards/a/AegisAutomaton.java index ae6e30725aa..aca72950ae5 100644 --- a/Mage.Sets/src/mage/cards/a/AegisAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AegisAutomaton.java @@ -25,7 +25,7 @@ public final class AegisAutomaton extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AegisAutomaton(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AerialGuide.java b/Mage.Sets/src/mage/cards/a/AerialGuide.java index c39dd4fa699..55ddd1a1a36 100644 --- a/Mage.Sets/src/mage/cards/a/AerialGuide.java +++ b/Mage.Sets/src/mage/cards/a/AerialGuide.java @@ -25,7 +25,7 @@ public final class AerialGuide extends CardImpl { static final FilterAttackingCreature filter = new FilterAttackingCreature("another target attacking creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AerialGuide(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java b/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java index 2e25504f2fb..927aa2b43a2 100644 --- a/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java +++ b/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java @@ -76,7 +76,7 @@ class AetherbornMarauderEffect extends OneShotEffect { Permanent sourceObject = game.getPermanent(source.getSourceId()); if (controller != null && sourceObject != null) { FilterControlledPermanent filter = new FilterControlledPermanent("permanent you control to remove +1/+1 counters from"); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new CounterPredicate(CounterType.P1P1)); boolean firstRun = true; while (game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game) > 0) { diff --git a/Mage.Sets/src/mage/cards/a/AethersquallAncient.java b/Mage.Sets/src/mage/cards/a/AethersquallAncient.java index 7f2ef613107..fa621583395 100644 --- a/Mage.Sets/src/mage/cards/a/AethersquallAncient.java +++ b/Mage.Sets/src/mage/cards/a/AethersquallAncient.java @@ -27,7 +27,7 @@ public final class AethersquallAncient extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AethersquallAncient(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java b/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java index 7d95193116a..1d4a95c8911 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java +++ b/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java @@ -36,7 +36,7 @@ public final class AjaniSteadfast extends CardImpl { private static final FilterPlaneswalkerPermanent filter = new FilterPlaneswalkerPermanent("other planeswalker you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java b/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java index f7ba38516c5..ab5289a0286 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java +++ b/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java @@ -35,7 +35,7 @@ public final class AjaniUnyielding extends CardImpl { static { nonlandPermanentFilter.add(Predicates.not(new CardTypePredicate(CardType.LAND))); planeswalkerFilter.add(new ControllerPredicate(TargetController.YOU)); - planeswalkerFilter.add(new AnotherPredicate()); + planeswalkerFilter.add(AnotherPredicate.instance); } public AjaniUnyielding(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java b/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java index 0e443e10e26..67907265a02 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java +++ b/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java @@ -28,7 +28,7 @@ public final class AkroanConscriptor extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AkroanConscriptor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java b/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java index 0fbb0b78f94..95122867986 100644 --- a/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java +++ b/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java @@ -21,7 +21,7 @@ public final class AltarOfTheBrood extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another permanent"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AltarOfTheBrood(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java b/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java index 821128e1d72..18e0f9a1506 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java +++ b/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java @@ -22,7 +22,7 @@ public final class AmbushKrotiq extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AmbushKrotiq(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java b/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java index 23a6897b4b9..bdd8b1e1ed1 100644 --- a/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java +++ b/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java @@ -40,7 +40,7 @@ public class AminatouTheFateShifter extends CardImpl { static { filter.add(new OwnerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AminatouTheFateShifter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AnabaAncestor.java b/Mage.Sets/src/mage/cards/a/AnabaAncestor.java index 261ab7c1e76..65a6936cc41 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaAncestor.java +++ b/Mage.Sets/src/mage/cards/a/AnabaAncestor.java @@ -28,7 +28,7 @@ public final class AnabaAncestor extends CardImpl { static { filter.add(new SubtypePredicate(SubType.MINOTAUR)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AnabaAncestor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java b/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java index 3e6aa231965..5760f40edec 100644 --- a/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java +++ b/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java @@ -26,7 +26,7 @@ public final class AnafenzaKinTreeSpirit extends CardImpl { static { filter.add(Predicates.not(new TokenPredicate())); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AnafenzaKinTreeSpirit(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java index 16fb5ec22a7..aa00ce83a03 100644 --- a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java +++ b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java @@ -32,7 +32,7 @@ public final class AnafenzaTheForemost extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target tapped creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new TappedPredicate()); } diff --git a/Mage.Sets/src/mage/cards/a/AncestralMask.java b/Mage.Sets/src/mage/cards/a/AncestralMask.java index 60e6948212c..bbfa90a8747 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralMask.java +++ b/Mage.Sets/src/mage/cards/a/AncestralMask.java @@ -24,7 +24,7 @@ public final class AncestralMask extends CardImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("each other enchantment on the battlefield"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AncestralMask(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AngelOfCondemnation.java b/Mage.Sets/src/mage/cards/a/AngelOfCondemnation.java index 19a9acf8388..b407c9e41f8 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfCondemnation.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfCondemnation.java @@ -39,7 +39,7 @@ public final class AngelOfCondemnation extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AngelOfCondemnation(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AngelicCaptain.java b/Mage.Sets/src/mage/cards/a/AngelicCaptain.java index 4f04176e98d..3b16d8ebfb6 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicCaptain.java +++ b/Mage.Sets/src/mage/cards/a/AngelicCaptain.java @@ -26,7 +26,7 @@ public final class AngelicCaptain extends CardImpl { static { filter.add(new SubtypePredicate(SubType.ALLY)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AngelicCaptain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ApocalypseDemon.java b/Mage.Sets/src/mage/cards/a/ApocalypseDemon.java index db37a8a4433..9a1882a6e70 100644 --- a/Mage.Sets/src/mage/cards/a/ApocalypseDemon.java +++ b/Mage.Sets/src/mage/cards/a/ApocalypseDemon.java @@ -25,7 +25,7 @@ public final class ApocalypseDemon extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ApocalypseDemon(UUID ownerId, CardSetInfo cardSetInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java b/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java index 97bf7f87a6b..a4cbd66ee7a 100644 --- a/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java +++ b/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java @@ -27,7 +27,7 @@ public final class ApothecaryGeist extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Elf"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.SPIRIT)); } diff --git a/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java b/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java index 9eb4e17736c..c0b90860417 100644 --- a/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java +++ b/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java @@ -41,10 +41,10 @@ public final class ArahboRoarOfTheWorld extends CardImpl { static { filter.add(new SubtypePredicate(SubType.CAT)); filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter2.add(new SubtypePredicate(SubType.CAT)); filter2.add(new ControllerPredicate(TargetController.YOU)); - filter2.add(new AnotherPredicate()); + filter2.add(AnotherPredicate.instance); } public ArahboRoarOfTheWorld(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArashinForemost.java b/Mage.Sets/src/mage/cards/a/ArashinForemost.java index fdee5a88fc4..2fbb32c68af 100644 --- a/Mage.Sets/src/mage/cards/a/ArashinForemost.java +++ b/Mage.Sets/src/mage/cards/a/ArashinForemost.java @@ -27,7 +27,7 @@ public final class ArashinForemost extends CardImpl { static { filter.add(new SubtypePredicate(SubType.WARRIOR)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ArashinForemost(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java b/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java index 5e62cf8f8cf..f4d125a5540 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java @@ -25,7 +25,7 @@ public final class ArcboundCrusher extends CardImpl { private static final FilterPermanent filter = new FilterArtifactPermanent("another artifact"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ArcboundCrusher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java b/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java index 8609bb3fa8d..c791c256806 100644 --- a/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java +++ b/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java @@ -29,7 +29,7 @@ public final class AshenmoorCohort extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.BLACK)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } private static final String rule = "Ashenmoor Cohort gets +1/+1 as long as you control another black creature"; diff --git a/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java b/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java index fbd70641c0a..c2d40f3fb84 100644 --- a/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java +++ b/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java @@ -36,7 +36,7 @@ public final class AthreosGodOfPassage extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you own"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new OwnerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/a/AtzocanArcher.java b/Mage.Sets/src/mage/cards/a/AtzocanArcher.java index dfb3b1bbfd6..c07989dd627 100644 --- a/Mage.Sets/src/mage/cards/a/AtzocanArcher.java +++ b/Mage.Sets/src/mage/cards/a/AtzocanArcher.java @@ -25,7 +25,7 @@ public final class AtzocanArcher extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AtzocanArcher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AuraGraft.java b/Mage.Sets/src/mage/cards/a/AuraGraft.java index 414c76e5b1b..7e0293246cc 100644 --- a/Mage.Sets/src/mage/cards/a/AuraGraft.java +++ b/Mage.Sets/src/mage/cards/a/AuraGraft.java @@ -120,7 +120,7 @@ class MoveTargetAuraEffect extends OneShotEffect { } FilterPermanent filter = new FilterPermanent("another permanent " + enchantment.getLogName() + " can enchant"); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new PermanentCanBeAttachedToPredicate(enchantment)); Target target = new TargetPermanent(filter); target.setNotTarget(true); diff --git a/Mage.Sets/src/mage/cards/a/AuriokChampion.java b/Mage.Sets/src/mage/cards/a/AuriokChampion.java index 4b0fa72273e..6bb9d6e8fea 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokChampion.java +++ b/Mage.Sets/src/mage/cards/a/AuriokChampion.java @@ -24,7 +24,7 @@ public final class AuriokChampion extends CardImpl { private static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AuriokChampion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/Aurochs.java b/Mage.Sets/src/mage/cards/a/Aurochs.java index d1b68781a73..ddd1acbe40a 100644 --- a/Mage.Sets/src/mage/cards/a/Aurochs.java +++ b/Mage.Sets/src/mage/cards/a/Aurochs.java @@ -27,7 +27,7 @@ public final class Aurochs extends CardImpl { static { filter1.add(new SubtypePredicate(SubType.AUROCHS)); - filter1.add(new AnotherPredicate()); + filter1.add(AnotherPredicate.instance); } public Aurochs(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AurochsHerd.java b/Mage.Sets/src/mage/cards/a/AurochsHerd.java index ab0b6b6ef20..62223e8f2ef 100644 --- a/Mage.Sets/src/mage/cards/a/AurochsHerd.java +++ b/Mage.Sets/src/mage/cards/a/AurochsHerd.java @@ -33,7 +33,7 @@ public final class AurochsHerd extends CardImpl { static { filter1.add(new SubtypePredicate(SubType.AUROCHS)); filter2.add(new SubtypePredicate(SubType.AUROCHS)); - filter2.add(new AnotherPredicate()); + filter2.add(AnotherPredicate.instance); } public AurochsHerd(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AuroraChampion.java b/Mage.Sets/src/mage/cards/a/AuroraChampion.java index 365bb5f82ec..b4932d81b25 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraChampion.java +++ b/Mage.Sets/src/mage/cards/a/AuroraChampion.java @@ -25,7 +25,7 @@ public final class AuroraChampion extends CardImpl { private static final FilterTeamPermanent filter = new FilterTeamPermanent(SubType.WARRIOR, "another Warrior"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AuroraChampion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java b/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java index ec6d5355c2e..acc437a5726 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java +++ b/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java @@ -33,7 +33,7 @@ public final class AvacynGuardianAngel extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AvacynGuardianAngel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java b/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java index e3ff29da23e..47dfa768b66 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java +++ b/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java @@ -107,7 +107,7 @@ class AvacynThePurifierEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { FilterCreaturePermanent filter = new FilterCreaturePermanent("each other creature"); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); List permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game); for (Permanent permanent : permanents) { permanent.damage(3, source.getSourceId(), game, false, true); diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java b/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java index 1265256eb77..987d7a0122a 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java @@ -28,7 +28,7 @@ public final class AvatarOfTheResolute extends CardImpl { static { filter.add(new CounterPredicate(CounterType.P1P1)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AvatarOfTheResolute(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AviaryMechanic.java b/Mage.Sets/src/mage/cards/a/AviaryMechanic.java index 37acc4e67e9..59a64bd2345 100644 --- a/Mage.Sets/src/mage/cards/a/AviaryMechanic.java +++ b/Mage.Sets/src/mage/cards/a/AviaryMechanic.java @@ -21,7 +21,7 @@ public final class AviaryMechanic extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another permanent you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public AviaryMechanic(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BallynockCohort.java b/Mage.Sets/src/mage/cards/b/BallynockCohort.java index 564920405b7..e241fcec13a 100644 --- a/Mage.Sets/src/mage/cards/b/BallynockCohort.java +++ b/Mage.Sets/src/mage/cards/b/BallynockCohort.java @@ -32,7 +32,7 @@ public final class BallynockCohort extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.WHITE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } private String rule = "{this} gets +1/+1 as long as you control another white creature"; diff --git a/Mage.Sets/src/mage/cards/b/BalthorTheStout.java b/Mage.Sets/src/mage/cards/b/BalthorTheStout.java index ef768145d4d..1e280dd027f 100644 --- a/Mage.Sets/src/mage/cards/b/BalthorTheStout.java +++ b/Mage.Sets/src/mage/cards/b/BalthorTheStout.java @@ -28,7 +28,7 @@ public final class BalthorTheStout extends CardImpl { static { filter1.add(new SubtypePredicate(SubType.BARBARIAN)); - filter2.add(new AnotherPredicate()); + filter2.add(AnotherPredicate.instance); filter2.add(new SubtypePredicate(SubType.BARBARIAN)); } diff --git a/Mage.Sets/src/mage/cards/b/BantSureblade.java b/Mage.Sets/src/mage/cards/b/BantSureblade.java index 15c2410d1a1..908a9e84b86 100644 --- a/Mage.Sets/src/mage/cards/b/BantSureblade.java +++ b/Mage.Sets/src/mage/cards/b/BantSureblade.java @@ -30,7 +30,7 @@ public final class BantSureblade extends CardImpl { static { filter.add(new MulticoloredPredicate()); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BantSureblade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BaronSengir.java b/Mage.Sets/src/mage/cards/b/BaronSengir.java index f69bada8d5e..41375fb1ce3 100644 --- a/Mage.Sets/src/mage/cards/b/BaronSengir.java +++ b/Mage.Sets/src/mage/cards/b/BaronSengir.java @@ -32,7 +32,7 @@ public final class BaronSengir extends CardImpl { static { filter.add(new SubtypePredicate(SubType.VAMPIRE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BaronSengir(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java index 1c95a11f61e..70ed9030db0 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java +++ b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java @@ -31,7 +31,7 @@ public final class BarrageTyrant extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another colorless creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ColorlessPredicate()); } diff --git a/Mage.Sets/src/mage/cards/b/BarrenGlory.java b/Mage.Sets/src/mage/cards/b/BarrenGlory.java index 78113c6343c..29ae7eb6666 100644 --- a/Mage.Sets/src/mage/cards/b/BarrenGlory.java +++ b/Mage.Sets/src/mage/cards/b/BarrenGlory.java @@ -24,7 +24,7 @@ public final class BarrenGlory extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BarrenGlory(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BazaarKrovod.java b/Mage.Sets/src/mage/cards/b/BazaarKrovod.java index 672dcfb1ec6..858ae9db6a1 100644 --- a/Mage.Sets/src/mage/cards/b/BazaarKrovod.java +++ b/Mage.Sets/src/mage/cards/b/BazaarKrovod.java @@ -28,7 +28,7 @@ public final class BazaarKrovod extends CardImpl { static final FilterAttackingCreature filter = new FilterAttackingCreature("another target attacking creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BazaarKrovod(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BellowingAegisaur.java b/Mage.Sets/src/mage/cards/b/BellowingAegisaur.java index e5942e94a59..e12a62d4bb7 100644 --- a/Mage.Sets/src/mage/cards/b/BellowingAegisaur.java +++ b/Mage.Sets/src/mage/cards/b/BellowingAegisaur.java @@ -27,7 +27,7 @@ public final class BellowingAegisaur extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BellowingAegisaur(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BelltollDragon.java b/Mage.Sets/src/mage/cards/b/BelltollDragon.java index f2f6f73f80d..1a0407c5ce6 100644 --- a/Mage.Sets/src/mage/cards/b/BelltollDragon.java +++ b/Mage.Sets/src/mage/cards/b/BelltollDragon.java @@ -27,7 +27,7 @@ public final class BelltollDragon extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other Dragon creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.DRAGON)); } diff --git a/Mage.Sets/src/mage/cards/b/BindingMummy.java b/Mage.Sets/src/mage/cards/b/BindingMummy.java index 7ebaf193383..69217bf9a99 100644 --- a/Mage.Sets/src/mage/cards/b/BindingMummy.java +++ b/Mage.Sets/src/mage/cards/b/BindingMummy.java @@ -26,7 +26,7 @@ public final class BindingMummy extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Zombie"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.ZOMBIE)); } diff --git a/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java b/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java index c27c99be182..c9f54643936 100644 --- a/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java +++ b/Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java @@ -30,7 +30,7 @@ public final class BlackOakOfOdunos extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another untapped creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new TappedPredicate())); } diff --git a/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java b/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java index 52688ab0cfb..bb9a88fe7f6 100644 --- a/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java +++ b/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java @@ -25,7 +25,7 @@ public final class BlindSpotGiant extends CardImpl { static { filter.add(new SubtypePredicate(SubType.GIANT)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BlindSpotGiant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java b/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java index 5ad22400d94..2c5135dbebc 100644 --- a/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java +++ b/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java @@ -31,7 +31,7 @@ public final class BloodChinFanatic extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another Warrior creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.WARRIOR)); } diff --git a/Mage.Sets/src/mage/cards/b/Bloodbriar.java b/Mage.Sets/src/mage/cards/b/Bloodbriar.java index f7920debb3e..644927bfcbf 100644 --- a/Mage.Sets/src/mage/cards/b/Bloodbriar.java +++ b/Mage.Sets/src/mage/cards/b/Bloodbriar.java @@ -25,7 +25,7 @@ public final class Bloodbriar extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public Bloodbriar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodmistInfiltrator.java b/Mage.Sets/src/mage/cards/b/BloodmistInfiltrator.java index c38d172640e..1a523bb7395 100644 --- a/Mage.Sets/src/mage/cards/b/BloodmistInfiltrator.java +++ b/Mage.Sets/src/mage/cards/b/BloodmistInfiltrator.java @@ -26,7 +26,7 @@ public final class BloodmistInfiltrator extends CardImpl { = new FilterControlledCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BloodmistInfiltrator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoltwingMarauder.java b/Mage.Sets/src/mage/cards/b/BoltwingMarauder.java index 58c3574144b..230401b197f 100644 --- a/Mage.Sets/src/mage/cards/b/BoltwingMarauder.java +++ b/Mage.Sets/src/mage/cards/b/BoltwingMarauder.java @@ -26,7 +26,7 @@ public final class BoltwingMarauder extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature under your control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BoltwingMarauder(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java b/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java index 58c5928fdba..e3350aa8774 100644 --- a/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java +++ b/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java @@ -29,7 +29,7 @@ public final class BoundByMoonsilver extends CardImpl { private final static FilterControlledPermanent filter = new FilterControlledPermanent("another permanent"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BoundByMoonsilver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BrambleSovereign.java b/Mage.Sets/src/mage/cards/b/BrambleSovereign.java index ab9ad76b56e..579be5ac6ea 100644 --- a/Mage.Sets/src/mage/cards/b/BrambleSovereign.java +++ b/Mage.Sets/src/mage/cards/b/BrambleSovereign.java @@ -33,7 +33,7 @@ public final class BrambleSovereign extends CardImpl { static { filter.add(Predicates.not(new TokenPredicate())); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BrambleSovereign(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BreachingHippocamp.java b/Mage.Sets/src/mage/cards/b/BreachingHippocamp.java index dd74b144c30..3d192902243 100644 --- a/Mage.Sets/src/mage/cards/b/BreachingHippocamp.java +++ b/Mage.Sets/src/mage/cards/b/BreachingHippocamp.java @@ -23,7 +23,7 @@ public final class BreachingHippocamp extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BreachingHippocamp(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BriarberryCohort.java b/Mage.Sets/src/mage/cards/b/BriarberryCohort.java index ea7b0b76495..888f21eede9 100644 --- a/Mage.Sets/src/mage/cards/b/BriarberryCohort.java +++ b/Mage.Sets/src/mage/cards/b/BriarberryCohort.java @@ -32,7 +32,7 @@ public final class BriarberryCohort extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.BLUE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } private String rule = "{this} gets +1/+1 as long as you control another blue creature"; diff --git a/Mage.Sets/src/mage/cards/b/BrionStoutarm.java b/Mage.Sets/src/mage/cards/b/BrionStoutarm.java index f6939807c74..a39a9e10602 100644 --- a/Mage.Sets/src/mage/cards/b/BrionStoutarm.java +++ b/Mage.Sets/src/mage/cards/b/BrionStoutarm.java @@ -30,7 +30,7 @@ public final class BrionStoutarm extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature other than Brion Stoutarm"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BrionStoutarm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BronzeHorse.java b/Mage.Sets/src/mage/cards/b/BronzeHorse.java index 28180cf2bb4..bcd1ed31664 100644 --- a/Mage.Sets/src/mage/cards/b/BronzeHorse.java +++ b/Mage.Sets/src/mage/cards/b/BronzeHorse.java @@ -33,7 +33,7 @@ public final class BronzeHorse extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BronzeHorse(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BronzebeakMoa.java b/Mage.Sets/src/mage/cards/b/BronzebeakMoa.java index b8d9f77917c..949498cd939 100644 --- a/Mage.Sets/src/mage/cards/b/BronzebeakMoa.java +++ b/Mage.Sets/src/mage/cards/b/BronzebeakMoa.java @@ -25,7 +25,7 @@ public final class BronzebeakMoa extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature under your control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BronzebeakMoa (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{W}"); diff --git a/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java b/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java index 1cfb85d3243..bacf632163e 100644 --- a/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java +++ b/Mage.Sets/src/mage/cards/b/BrothersYamazaki.java @@ -31,7 +31,7 @@ public final class BrothersYamazaki extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new NamePredicate("Brothers Yamazaki")); } diff --git a/Mage.Sets/src/mage/cards/b/BullAurochs.java b/Mage.Sets/src/mage/cards/b/BullAurochs.java index 7f4e83734d8..7da88699f1b 100644 --- a/Mage.Sets/src/mage/cards/b/BullAurochs.java +++ b/Mage.Sets/src/mage/cards/b/BullAurochs.java @@ -27,7 +27,7 @@ public final class BullAurochs extends CardImpl { static { filter.add(new SubtypePredicate(SubType.AUROCHS)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BullAurochs(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BullRushBruiser.java b/Mage.Sets/src/mage/cards/b/BullRushBruiser.java index ac0cfeaab98..b89ace249d7 100644 --- a/Mage.Sets/src/mage/cards/b/BullRushBruiser.java +++ b/Mage.Sets/src/mage/cards/b/BullRushBruiser.java @@ -24,7 +24,7 @@ public final class BullRushBruiser extends CardImpl { private static final FilterTeamPermanent filter = new FilterTeamPermanent(SubType.WARRIOR, "another Warrior"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public BullRushBruiser(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java index 2a1470958ca..b936bb82bf2 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java +++ b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java @@ -31,7 +31,7 @@ public final class CaptainOfTheMists extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("another Human"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.HUMAN)); } diff --git a/Mage.Sets/src/mage/cards/c/CarnifexDemon.java b/Mage.Sets/src/mage/cards/c/CarnifexDemon.java index 9d2bb438dd5..72a8bdb8689 100644 --- a/Mage.Sets/src/mage/cards/c/CarnifexDemon.java +++ b/Mage.Sets/src/mage/cards/c/CarnifexDemon.java @@ -28,7 +28,7 @@ public final class CarnifexDemon extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each other creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public CarnifexDemon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CatacombSifter.java b/Mage.Sets/src/mage/cards/c/CatacombSifter.java index 43f3e15b984..39d60404112 100644 --- a/Mage.Sets/src/mage/cards/c/CatacombSifter.java +++ b/Mage.Sets/src/mage/cards/c/CatacombSifter.java @@ -26,7 +26,7 @@ public final class CatacombSifter extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/c/CennsHeir.java b/Mage.Sets/src/mage/cards/c/CennsHeir.java index ed5c3645f2b..c5dc2acad2a 100644 --- a/Mage.Sets/src/mage/cards/c/CennsHeir.java +++ b/Mage.Sets/src/mage/cards/c/CennsHeir.java @@ -25,7 +25,7 @@ public final class CennsHeir extends CardImpl { static { filter.add(new SubtypePredicate(SubType.KITHKIN)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public CennsHeir(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java b/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java index de10a0845e0..79b077a5d31 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java @@ -30,7 +30,7 @@ public final class ChampionOfLambholt extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java b/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java index 9bfb91786ed..53634931b27 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfStraySouls.java @@ -33,7 +33,7 @@ public final class ChampionOfStraySouls extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ChampionOfStraySouls(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java b/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java index 8e57197839b..617487fb233 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java @@ -24,7 +24,7 @@ public final class ChampionOfTheParish extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("another Human"); static { filter.add(new SubtypePredicate(SubType.HUMAN)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ChampionOfTheParish(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChaosMaw.java b/Mage.Sets/src/mage/cards/c/ChaosMaw.java index 7916f847db4..c53c0263ea3 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosMaw.java +++ b/Mage.Sets/src/mage/cards/c/ChaosMaw.java @@ -14,7 +14,7 @@ import mage.filter.predicate.permanent.AnotherPredicate; public final class ChaosMaw extends CardImpl { private static FilterCreaturePermanent filter = new FilterCreaturePermanent("other creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ChaosMaw(UUID ownerId, CardSetInfo cardSetInfo){ super(ownerId, cardSetInfo, new CardType[]{CardType.CREATURE}, "{5}{R}{R}"); diff --git a/Mage.Sets/src/mage/cards/c/CherishedHatchling.java b/Mage.Sets/src/mage/cards/c/CherishedHatchling.java index db61ecd7c33..a4bfcdfa488 100644 --- a/Mage.Sets/src/mage/cards/c/CherishedHatchling.java +++ b/Mage.Sets/src/mage/cards/c/CherishedHatchling.java @@ -66,7 +66,7 @@ class CherishedHatchlingTriggeredAbility extends DelayedTriggeredAbility { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public CherishedHatchlingTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/c/Chewbacca.java b/Mage.Sets/src/mage/cards/c/Chewbacca.java index 66f13c8ea06..be15218f899 100644 --- a/Mage.Sets/src/mage/cards/c/Chewbacca.java +++ b/Mage.Sets/src/mage/cards/c/Chewbacca.java @@ -26,7 +26,7 @@ public final class Chewbacca extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public Chewbacca(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChewbaccaTheBeast.java b/Mage.Sets/src/mage/cards/c/ChewbaccaTheBeast.java index d206feff7e5..19eb1840042 100644 --- a/Mage.Sets/src/mage/cards/c/ChewbaccaTheBeast.java +++ b/Mage.Sets/src/mage/cards/c/ChewbaccaTheBeast.java @@ -27,7 +27,7 @@ public final class ChewbaccaTheBeast extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new AttackingPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/ChiefChirpa.java b/Mage.Sets/src/mage/cards/c/ChiefChirpa.java index 4751f53f001..5cd547a4408 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefChirpa.java +++ b/Mage.Sets/src/mage/cards/c/ChiefChirpa.java @@ -40,7 +40,7 @@ public final class ChiefChirpa extends CardImpl { diedFilter.add(new ControllerPredicate(TargetController.YOU)); ewokFilter.add(new SubtypePredicate(SubType.EWOK)); - ewokFilter.add(new AnotherPredicate()); + ewokFilter.add(AnotherPredicate.instance); } public ChiefChirpa(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CinderGiant.java b/Mage.Sets/src/mage/cards/c/CinderGiant.java index bce7205df58..24cfbac2280 100644 --- a/Mage.Sets/src/mage/cards/c/CinderGiant.java +++ b/Mage.Sets/src/mage/cards/c/CinderGiant.java @@ -21,7 +21,7 @@ public final class CinderGiant extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("each other creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public CinderGiant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CoastalWizard.java b/Mage.Sets/src/mage/cards/c/CoastalWizard.java index 54bb6b7b243..1ed09be1495 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalWizard.java +++ b/Mage.Sets/src/mage/cards/c/CoastalWizard.java @@ -27,7 +27,7 @@ public final class CoastalWizard extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public CoastalWizard(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java index 6b03575c2a6..cc1b5456e10 100644 --- a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java +++ b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java @@ -32,7 +32,7 @@ public final class ConsecratedByBlood extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("two other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ConsecratedByBlood(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ConsulsShieldguard.java b/Mage.Sets/src/mage/cards/c/ConsulsShieldguard.java index a2a81ff2a78..16798cb14c1 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulsShieldguard.java +++ b/Mage.Sets/src/mage/cards/c/ConsulsShieldguard.java @@ -29,7 +29,7 @@ public final class ConsulsShieldguard extends CardImpl { private final static FilterAttackingCreature filter = new FilterAttackingCreature(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ConsulsShieldguard(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java b/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java index 4706b03adb8..6c4fad4bf0e 100644 --- a/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java +++ b/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java @@ -29,7 +29,7 @@ public final class CourtStreetDenizen extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("another white creature"); private static final FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ColorPredicate(ObjectColor.WHITE)); filter.add(new ControllerPredicate(TargetController.YOU)); filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/c/CrabappleCohort.java b/Mage.Sets/src/mage/cards/c/CrabappleCohort.java index 3cc760d1094..aa536b97243 100644 --- a/Mage.Sets/src/mage/cards/c/CrabappleCohort.java +++ b/Mage.Sets/src/mage/cards/c/CrabappleCohort.java @@ -33,7 +33,7 @@ public final class CrabappleCohort extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.GREEN)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public CrabappleCohort(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/Cryptoplasm.java b/Mage.Sets/src/mage/cards/c/Cryptoplasm.java index ac76c4b3397..2fcf2c30d97 100644 --- a/Mage.Sets/src/mage/cards/c/Cryptoplasm.java +++ b/Mage.Sets/src/mage/cards/c/Cryptoplasm.java @@ -28,7 +28,7 @@ public final class Cryptoplasm extends CardImpl { final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public Cryptoplasm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java b/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java index 2653f5d1f35..ab23d88f7d7 100644 --- a/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java +++ b/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java @@ -29,7 +29,7 @@ public final class CustodiSoulbinders extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public CustodiSoulbinders(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java b/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java index 427e58c7980..56b2902961e 100644 --- a/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java +++ b/Mage.Sets/src/mage/cards/c/CytoplastRootKin.java @@ -32,7 +32,7 @@ public final class CytoplastRootKin extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other creature you control that has a +1/+1 counter on it"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/d/DarkslickShores.java b/Mage.Sets/src/mage/cards/d/DarkslickShores.java index 1739e630876..0dffdd6e4b2 100644 --- a/Mage.Sets/src/mage/cards/d/DarkslickShores.java +++ b/Mage.Sets/src/mage/cards/d/DarkslickShores.java @@ -26,7 +26,7 @@ public final class DarkslickShores extends CardImpl { private final static FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public DarkslickShores(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java b/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java index 1d7eedc6ade..6b28ec08fce 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessBodyguard.java @@ -65,7 +65,7 @@ class DauntlessBodyguardChooseCreatureEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public DauntlessBodyguardChooseCreatureEffect() { diff --git a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java index 15fb9b45822..be7b60f0b46 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java @@ -36,7 +36,7 @@ public final class DauntlessDourbark extends CardImpl { filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), new SubtypePredicate(SubType.TREEFOLK))); filter2.add(new SubtypePredicate(SubType.TREEFOLK)); - filter2.add(new AnotherPredicate()); + filter2.add(AnotherPredicate.instance); } final static private String rule = "{this} has trample as long as you control another Treefolk"; diff --git a/Mage.Sets/src/mage/cards/d/DeathbringerRegent.java b/Mage.Sets/src/mage/cards/d/DeathbringerRegent.java index 4aa59062ae6..023015b9e0d 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbringerRegent.java +++ b/Mage.Sets/src/mage/cards/d/DeathbringerRegent.java @@ -29,7 +29,7 @@ public final class DeathbringerRegent extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public DeathbringerRegent(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DecoratedChampion.java b/Mage.Sets/src/mage/cards/d/DecoratedChampion.java index aff6d8543bc..bdae9b0118c 100644 --- a/Mage.Sets/src/mage/cards/d/DecoratedChampion.java +++ b/Mage.Sets/src/mage/cards/d/DecoratedChampion.java @@ -22,7 +22,7 @@ public final class DecoratedChampion extends CardImpl { private static final FilterTeamPermanent filter = new FilterTeamPermanent(SubType.WARRIOR, "another Warrior"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public DecoratedChampion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeeprootElite.java b/Mage.Sets/src/mage/cards/d/DeeprootElite.java index 8f2133da262..ca4130031cb 100644 --- a/Mage.Sets/src/mage/cards/d/DeeprootElite.java +++ b/Mage.Sets/src/mage/cards/d/DeeprootElite.java @@ -26,7 +26,7 @@ public final class DeeprootElite extends CardImpl { private static final FilterPermanent filterYourAnotherMerfolk = new FilterPermanent(SubType.MERFOLK, "another " + SubType.MERFOLK.toString()); static { - filterYourAnotherMerfolk.add(new AnotherPredicate()); + filterYourAnotherMerfolk.add(AnotherPredicate.instance); filterYourAnotherMerfolk.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/d/DefiantGreatmaw.java b/Mage.Sets/src/mage/cards/d/DefiantGreatmaw.java index b71d27ff4f1..731df0f5c73 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantGreatmaw.java +++ b/Mage.Sets/src/mage/cards/d/DefiantGreatmaw.java @@ -60,7 +60,7 @@ class DefiantGreatmawTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/d/DemonicTaskmaster.java b/Mage.Sets/src/mage/cards/d/DemonicTaskmaster.java index 252b91460ca..13671d2f68c 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicTaskmaster.java +++ b/Mage.Sets/src/mage/cards/d/DemonicTaskmaster.java @@ -24,7 +24,7 @@ public final class DemonicTaskmaster extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a creature other than Demonic Taskmaster"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public DemonicTaskmaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DemonlordOfAshmouth.java b/Mage.Sets/src/mage/cards/d/DemonlordOfAshmouth.java index e409e89cb4b..23928b343ac 100644 --- a/Mage.Sets/src/mage/cards/d/DemonlordOfAshmouth.java +++ b/Mage.Sets/src/mage/cards/d/DemonlordOfAshmouth.java @@ -24,7 +24,7 @@ public final class DemonlordOfAshmouth extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(" another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public DemonlordOfAshmouth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DenizenOfTheDeep.java b/Mage.Sets/src/mage/cards/d/DenizenOfTheDeep.java index 7797d8b3cec..806ce42168b 100644 --- a/Mage.Sets/src/mage/cards/d/DenizenOfTheDeep.java +++ b/Mage.Sets/src/mage/cards/d/DenizenOfTheDeep.java @@ -22,7 +22,7 @@ public final class DenizenOfTheDeep extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static{ - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public DenizenOfTheDeep(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java b/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java index ffdc206d10c..da6d0e5ba6d 100644 --- a/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java +++ b/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java @@ -26,7 +26,7 @@ public final class DeputyOfAcquittals extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/d/DesolationGiant.java b/Mage.Sets/src/mage/cards/d/DesolationGiant.java index ebe02abc01c..5ca7943adbd 100644 --- a/Mage.Sets/src/mage/cards/d/DesolationGiant.java +++ b/Mage.Sets/src/mage/cards/d/DesolationGiant.java @@ -27,8 +27,8 @@ public final class DesolationGiant extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("other creatures you control"); static { - filter.add(new AnotherPredicate()); - filter2.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); + filter2.add(AnotherPredicate.instance); filter2.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/d/DireFleetCaptain.java b/Mage.Sets/src/mage/cards/d/DireFleetCaptain.java index 10efe1d3897..45e32a2b7d7 100644 --- a/Mage.Sets/src/mage/cards/d/DireFleetCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DireFleetCaptain.java @@ -25,7 +25,7 @@ public final class DireFleetCaptain extends CardImpl { static { filter.add(new SubtypePredicate(SubType.PIRATE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public DireFleetCaptain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DominatorDrone.java b/Mage.Sets/src/mage/cards/d/DominatorDrone.java index 3a06feb1f12..5cd9f278b7b 100644 --- a/Mage.Sets/src/mage/cards/d/DominatorDrone.java +++ b/Mage.Sets/src/mage/cards/d/DominatorDrone.java @@ -28,7 +28,7 @@ public final class DominatorDrone extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another colorless creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ColorlessPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/Dracoplasm.java b/Mage.Sets/src/mage/cards/d/Dracoplasm.java index aa478448c10..974da8aa9d5 100644 --- a/Mage.Sets/src/mage/cards/d/Dracoplasm.java +++ b/Mage.Sets/src/mage/cards/d/Dracoplasm.java @@ -63,7 +63,7 @@ class DracoplasmEffect extends ReplacementEffectImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public DracoplasmEffect() { diff --git a/Mage.Sets/src/mage/cards/d/DreadCacodemon.java b/Mage.Sets/src/mage/cards/d/DreadCacodemon.java index 9b8e1ad205d..2df82acf881 100644 --- a/Mage.Sets/src/mage/cards/d/DreadCacodemon.java +++ b/Mage.Sets/src/mage/cards/d/DreadCacodemon.java @@ -32,7 +32,7 @@ public final class DreadCacodemon extends CardImpl { private static final FilterCreaturePermanent otherCreaturesYouControl = new FilterCreaturePermanent("other creatures you control"); static { otherCreaturesYouControl.add(new ControllerPredicate(TargetController.YOU)); - otherCreaturesYouControl.add(new AnotherPredicate()); + otherCreaturesYouControl.add(AnotherPredicate.instance); } public DreadCacodemon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java b/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java index 01d62c7422f..c0550a27942 100644 --- a/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java +++ b/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java @@ -32,7 +32,7 @@ public final class DreamcallerSiren extends CardImpl { static { filter.add(new SubtypePredicate(SubType.PIRATE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/d/DrillSkimmer.java b/Mage.Sets/src/mage/cards/d/DrillSkimmer.java index 0b60594721b..d379e662a37 100644 --- a/Mage.Sets/src/mage/cards/d/DrillSkimmer.java +++ b/Mage.Sets/src/mage/cards/d/DrillSkimmer.java @@ -30,7 +30,7 @@ public final class DrillSkimmer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("you control another artifact creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new CardTypePredicate(CardType.ARTIFACT)); } diff --git a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java index 3a2c558bfaf..d0613ac5203 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java @@ -28,7 +28,7 @@ public final class DrogskolCavalry extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another Spirit"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.SPIRIT)); } diff --git a/Mage.Sets/src/mage/cards/d/DustStalker.java b/Mage.Sets/src/mage/cards/d/DustStalker.java index c1d604b5888..3e879c2d975 100644 --- a/Mage.Sets/src/mage/cards/d/DustStalker.java +++ b/Mage.Sets/src/mage/cards/d/DustStalker.java @@ -28,7 +28,7 @@ public final class DustStalker extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("if you control no other colorless creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ColorlessPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/DwynensElite.java b/Mage.Sets/src/mage/cards/d/DwynensElite.java index 394a7071b5c..4e9e11890b2 100644 --- a/Mage.Sets/src/mage/cards/d/DwynensElite.java +++ b/Mage.Sets/src/mage/cards/d/DwynensElite.java @@ -27,7 +27,7 @@ public final class DwynensElite extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Elf"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.ELF)); } diff --git a/Mage.Sets/src/mage/cards/e/EaterOfHope.java b/Mage.Sets/src/mage/cards/e/EaterOfHope.java index 7cd660c058c..0524a4b541e 100644 --- a/Mage.Sets/src/mage/cards/e/EaterOfHope.java +++ b/Mage.Sets/src/mage/cards/e/EaterOfHope.java @@ -30,7 +30,7 @@ public final class EaterOfHope extends CardImpl { private static final FilterControlledCreaturePermanent destroyFilter = new FilterControlledCreaturePermanent("two other creatures"); static { - destroyFilter.add(new AnotherPredicate()); + destroyFilter.add(AnotherPredicate.instance); } public EaterOfHope(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EddytrailHawk.java b/Mage.Sets/src/mage/cards/e/EddytrailHawk.java index 2c312f1ba26..e7bf591e8c8 100644 --- a/Mage.Sets/src/mage/cards/e/EddytrailHawk.java +++ b/Mage.Sets/src/mage/cards/e/EddytrailHawk.java @@ -29,7 +29,7 @@ public final class EddytrailHawk extends CardImpl { private final static FilterAttackingCreature filter = new FilterAttackingCreature(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public EddytrailHawk(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java b/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java index a0d9d1f5bae..0f71859daea 100644 --- a/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java +++ b/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java @@ -61,7 +61,7 @@ class EfreetWeaponmasterAbility extends TriggeredAbilityImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public EfreetWeaponmasterAbility() { diff --git a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java index 142cfa2b255..ca9423ccaee 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java +++ b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java @@ -29,7 +29,7 @@ public final class EldraziAggressor extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another colorless creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ColorlessPredicate()); } diff --git a/Mage.Sets/src/mage/cards/e/EldraziDisplacer.java b/Mage.Sets/src/mage/cards/e/EldraziDisplacer.java index c5dc494d1f1..8618e6afb6b 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziDisplacer.java +++ b/Mage.Sets/src/mage/cards/e/EldraziDisplacer.java @@ -28,7 +28,7 @@ public final class EldraziDisplacer extends CardImpl { private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("another target creature"); static { - FILTER.add(new AnotherPredicate()); + FILTER.add(AnotherPredicate.instance); } public EldraziDisplacer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EldraziMimic.java b/Mage.Sets/src/mage/cards/e/EldraziMimic.java index d90c7e78385..b2e7322440f 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziMimic.java +++ b/Mage.Sets/src/mage/cards/e/EldraziMimic.java @@ -28,7 +28,7 @@ public final class EldraziMimic extends CardImpl { private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("another colorless creature"); static { - FILTER.add(new AnotherPredicate()); + FILTER.add(AnotherPredicate.instance); FILTER.add(new ColorlessPredicate()); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishVanguard.java b/Mage.Sets/src/mage/cards/e/ElvishVanguard.java index a31344e7368..7591f622131 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishVanguard.java +++ b/Mage.Sets/src/mage/cards/e/ElvishVanguard.java @@ -24,7 +24,7 @@ public final class ElvishVanguard extends CardImpl { static { filter.add(new SubtypePredicate(SubType.ELF)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ElvishVanguard(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java b/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java index 15c20aff649..33faa4a9660 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java @@ -61,7 +61,7 @@ class EmrakulsEvangelCost extends CostImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("non-Eldrazi creatures you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new SubtypePredicate(SubType.ELDRAZI))); } diff --git a/Mage.Sets/src/mage/cards/e/EsperStormblade.java b/Mage.Sets/src/mage/cards/e/EsperStormblade.java index a326fa966ca..3803a6edcc3 100644 --- a/Mage.Sets/src/mage/cards/e/EsperStormblade.java +++ b/Mage.Sets/src/mage/cards/e/EsperStormblade.java @@ -30,7 +30,7 @@ public final class EsperStormblade extends CardImpl { static { filter.add(new MulticoloredPredicate()); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public EsperStormblade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EssenceWarden.java b/Mage.Sets/src/mage/cards/e/EssenceWarden.java index c66cb98aa79..d260fedbd5e 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceWarden.java +++ b/Mage.Sets/src/mage/cards/e/EssenceWarden.java @@ -21,7 +21,7 @@ public final class EssenceWarden extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public EssenceWarden(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EstridTheMasked.java b/Mage.Sets/src/mage/cards/e/EstridTheMasked.java index 9cc5c30fc42..f40fcbd162d 100644 --- a/Mage.Sets/src/mage/cards/e/EstridTheMasked.java +++ b/Mage.Sets/src/mage/cards/e/EstridTheMasked.java @@ -39,7 +39,7 @@ public final class EstridTheMasked extends CardImpl { static { filter.add(new EnchantedPredicate()); - filter2.add(new AnotherPredicate()); + filter2.add(AnotherPredicate.instance); } public EstridTheMasked(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java index 86225e14cb9..89feff77394 100644 --- a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java +++ b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java @@ -29,7 +29,7 @@ public final class ExavaRakdosBloodWitch extends CardImpl { filter.add(new CardTypePredicate(CardType.CREATURE)); filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new CounterPredicate(CounterType.P1P1)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } static final String rule = "Each other creature you control with a +1/+1 counter on it has haste"; diff --git a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java index e45f52bd337..d4c20acec30 100644 --- a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java +++ b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java @@ -60,7 +60,7 @@ class ExperimentKrajEffect extends ContinuousEffectImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { filter.add(new CounterPredicate(CounterType.P1P1)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ExperimentKrajEffect() { diff --git a/Mage.Sets/src/mage/cards/e/ExtractorDemon.java b/Mage.Sets/src/mage/cards/e/ExtractorDemon.java index 651e5e955b6..0576b6b22e5 100644 --- a/Mage.Sets/src/mage/cards/e/ExtractorDemon.java +++ b/Mage.Sets/src/mage/cards/e/ExtractorDemon.java @@ -27,7 +27,7 @@ public final class ExtractorDemon extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ExtractorDemon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java b/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java index 1322d056ffa..90dfa5684c4 100644 --- a/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java +++ b/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java @@ -32,7 +32,7 @@ public final class ExtricatorOfSin extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another permanent"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ExtricatorOfSin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java b/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java index 6ade1dc5b7e..ac296ce2ddb 100644 --- a/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java +++ b/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java @@ -31,7 +31,7 @@ public final class EzuriClawOfProgress extends CardImpl { static { filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3)); - filter2.add(new AnotherPredicate()); + filter2.add(AnotherPredicate.instance); } String rule = "Whenever a creature with power 2 or less enters the battlefield under your control, you get an experience counter."; diff --git a/Mage.Sets/src/mage/cards/f/FacelessButcher.java b/Mage.Sets/src/mage/cards/f/FacelessButcher.java index f44aec4ce8c..42bc86ffe65 100644 --- a/Mage.Sets/src/mage/cards/f/FacelessButcher.java +++ b/Mage.Sets/src/mage/cards/f/FacelessButcher.java @@ -30,7 +30,7 @@ public final class FacelessButcher extends CardImpl { static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/f/FacelessDevourer.java b/Mage.Sets/src/mage/cards/f/FacelessDevourer.java index aa573b1fa10..4148034851d 100644 --- a/Mage.Sets/src/mage/cards/f/FacelessDevourer.java +++ b/Mage.Sets/src/mage/cards/f/FacelessDevourer.java @@ -30,7 +30,7 @@ public final class FacelessDevourer extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new AbilityPredicate(ShadowAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/f/FaerieImpostor.java b/Mage.Sets/src/mage/cards/f/FaerieImpostor.java index 1a4b526b131..f744e080133 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieImpostor.java +++ b/Mage.Sets/src/mage/cards/f/FaerieImpostor.java @@ -58,7 +58,7 @@ class FaerieImpostorEffect extends OneShotEffect { private static final String effectText = "sacrifice it unless you return another creature you control to its owner's hand"; static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } FaerieImpostorEffect() { diff --git a/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java b/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java index bedb618045e..aa826d306aa 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java +++ b/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java @@ -30,7 +30,7 @@ public final class FaerieMiscreant extends CardImpl { static { filter.add(new NamePredicate("Faerie Miscreant")); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/f/FangOfThePack.java b/Mage.Sets/src/mage/cards/f/FangOfThePack.java index 71cda8c6bd9..353b13f54e1 100644 --- a/Mage.Sets/src/mage/cards/f/FangOfThePack.java +++ b/Mage.Sets/src/mage/cards/f/FangOfThePack.java @@ -26,7 +26,7 @@ public final class FangOfThePack extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public FangOfThePack(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Fatestitcher.java b/Mage.Sets/src/mage/cards/f/Fatestitcher.java index dc642fbbbf4..aec4bcc54a7 100644 --- a/Mage.Sets/src/mage/cards/f/Fatestitcher.java +++ b/Mage.Sets/src/mage/cards/f/Fatestitcher.java @@ -26,7 +26,7 @@ public final class Fatestitcher extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another target permanent"); static{ - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public Fatestitcher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FathomFleetBoarder.java b/Mage.Sets/src/mage/cards/f/FathomFleetBoarder.java index 90c40439fae..c697a74221e 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFleetBoarder.java +++ b/Mage.Sets/src/mage/cards/f/FathomFleetBoarder.java @@ -26,7 +26,7 @@ public final class FathomFleetBoarder extends CardImpl { static { filter.add(new SubtypePredicate(SubType.PIRATE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public FathomFleetBoarder(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java b/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java index d4f6bf40264..b97b96f86c0 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java +++ b/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java @@ -31,7 +31,7 @@ public final class FathomFleetCaptain extends CardImpl { static { filter.add(new SubtypePredicate(SubType.PIRATE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new TokenPredicate())); } diff --git a/Mage.Sets/src/mage/cards/f/FelhideBrawler.java b/Mage.Sets/src/mage/cards/f/FelhideBrawler.java index 03b687ceadb..119599817eb 100644 --- a/Mage.Sets/src/mage/cards/f/FelhideBrawler.java +++ b/Mage.Sets/src/mage/cards/f/FelhideBrawler.java @@ -24,7 +24,7 @@ public final class FelhideBrawler extends CardImpl { static { filter.add(new SubtypePredicate(SubType.MINOTAUR)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public FelhideBrawler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java b/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java index 2360250bd87..4b7c6561837 100644 --- a/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java +++ b/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java @@ -33,7 +33,7 @@ public final class FelhideSpiritbinder extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public FelhideSpiritbinder(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FelidarGuardian.java b/Mage.Sets/src/mage/cards/f/FelidarGuardian.java index 9931f38d368..cbd687eea89 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarGuardian.java +++ b/Mage.Sets/src/mage/cards/f/FelidarGuardian.java @@ -25,7 +25,7 @@ public final class FelidarGuardian extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another target permanent you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public FelidarGuardian(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Fettergeist.java b/Mage.Sets/src/mage/cards/f/Fettergeist.java index 63082827305..cb52e0ad48b 100644 --- a/Mage.Sets/src/mage/cards/f/Fettergeist.java +++ b/Mage.Sets/src/mage/cards/f/Fettergeist.java @@ -56,7 +56,7 @@ class FettergeistUnlessPaysEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public FettergeistUnlessPaysEffect() { diff --git a/Mage.Sets/src/mage/cards/f/FiendHunter.java b/Mage.Sets/src/mage/cards/f/FiendHunter.java index c1ab64d1b23..bd868bf9c8d 100644 --- a/Mage.Sets/src/mage/cards/f/FiendHunter.java +++ b/Mage.Sets/src/mage/cards/f/FiendHunter.java @@ -25,7 +25,7 @@ public final class FiendHunter extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public FiendHunter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FireAnts.java b/Mage.Sets/src/mage/cards/f/FireAnts.java index 208565fb1bc..a8bed48f784 100644 --- a/Mage.Sets/src/mage/cards/f/FireAnts.java +++ b/Mage.Sets/src/mage/cards/f/FireAnts.java @@ -27,7 +27,7 @@ public final class FireAnts extends CardImpl { static { filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public FireAnts(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FlameKinWarScout.java b/Mage.Sets/src/mage/cards/f/FlameKinWarScout.java index f255bdf5361..73580ab86c0 100644 --- a/Mage.Sets/src/mage/cards/f/FlameKinWarScout.java +++ b/Mage.Sets/src/mage/cards/f/FlameKinWarScout.java @@ -29,7 +29,7 @@ public final class FlameKinWarScout extends CardImpl { private static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public FlameKinWarScout(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FlamerushRider.java b/Mage.Sets/src/mage/cards/f/FlamerushRider.java index e6ed2e29da3..57a223dafb4 100644 --- a/Mage.Sets/src/mage/cards/f/FlamerushRider.java +++ b/Mage.Sets/src/mage/cards/f/FlamerushRider.java @@ -35,7 +35,7 @@ public final class FlamerushRider extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target attacking creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new AttackingPredicate()); } diff --git a/Mage.Sets/src/mage/cards/f/FlayerDrone.java b/Mage.Sets/src/mage/cards/f/FlayerDrone.java index 19482d906b7..3606868f174 100644 --- a/Mage.Sets/src/mage/cards/f/FlayerDrone.java +++ b/Mage.Sets/src/mage/cards/f/FlayerDrone.java @@ -27,7 +27,7 @@ public final class FlayerDrone extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another colorless creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ColorlessPredicate()); } diff --git a/Mage.Sets/src/mage/cards/f/FleshmadSteed.java b/Mage.Sets/src/mage/cards/f/FleshmadSteed.java index 491b9ce5f15..8b8a9ca914a 100644 --- a/Mage.Sets/src/mage/cards/f/FleshmadSteed.java +++ b/Mage.Sets/src/mage/cards/f/FleshmadSteed.java @@ -20,7 +20,7 @@ public final class FleshmadSteed extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public FleshmadSteed(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Flickerwisp.java b/Mage.Sets/src/mage/cards/f/Flickerwisp.java index 828b1b8d3b5..b4af63cae71 100644 --- a/Mage.Sets/src/mage/cards/f/Flickerwisp.java +++ b/Mage.Sets/src/mage/cards/f/Flickerwisp.java @@ -33,7 +33,7 @@ public final class Flickerwisp extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another target permanent"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public Flickerwisp(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheCoalition.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheCoalition.java index bb62690e7de..1cd38f8a524 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheCoalition.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheCoalition.java @@ -26,7 +26,7 @@ public final class ForerunnerOfTheCoalition extends CardImpl { private static final FilterPermanent filterAnotherPirate = new FilterPermanent(SubType.PIRATE, "another " + SubType.PIRATE.toString()); static { - filterAnotherPirate.add(new AnotherPredicate()); + filterAnotherPirate.add(AnotherPredicate.instance); filterAnotherPirate.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheHeralds.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheHeralds.java index c1eef1e04dd..1a161bba1c0 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheHeralds.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheHeralds.java @@ -28,7 +28,7 @@ public final class ForerunnerOfTheHeralds extends CardImpl { private static final FilterPermanent filterAnotherMerfolk = new FilterPermanent(SubType.MERFOLK, "another " + SubType.MERFOLK.toString()); static { - filterAnotherMerfolk.add(new AnotherPredicate()); + filterAnotherMerfolk.add(AnotherPredicate.instance); filterAnotherMerfolk.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheLegion.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheLegion.java index 2ada4b8d5a1..f5efb3eea30 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheLegion.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheLegion.java @@ -26,7 +26,7 @@ public final class ForerunnerOfTheLegion extends CardImpl { private static final FilterPermanent filterAnotherVampire = new FilterPermanent(SubType.VAMPIRE, "another " + SubType.VAMPIRE.toString()); static { - filterAnotherVampire.add(new AnotherPredicate()); + filterAnotherVampire.add(AnotherPredicate.instance); filterAnotherVampire.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/f/ForgottenAncient.java b/Mage.Sets/src/mage/cards/f/ForgottenAncient.java index 6693a73de18..dc8393e5afd 100644 --- a/Mage.Sets/src/mage/cards/f/ForgottenAncient.java +++ b/Mage.Sets/src/mage/cards/f/ForgottenAncient.java @@ -35,7 +35,7 @@ import java.util.UUID; public final class ForgottenAncient extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ForgottenAncient(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java b/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java index 49fb7989716..e60bfdec3b7 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java +++ b/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java @@ -27,7 +27,7 @@ public final class FoundryStreetDenizen extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("another red creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new ColorPredicate(ObjectColor.RED)); } diff --git a/Mage.Sets/src/mage/cards/g/GalepowderMage.java b/Mage.Sets/src/mage/cards/g/GalepowderMage.java index 8c7c5715f0c..f59ef1f9271 100644 --- a/Mage.Sets/src/mage/cards/g/GalepowderMage.java +++ b/Mage.Sets/src/mage/cards/g/GalepowderMage.java @@ -34,7 +34,7 @@ public final class GalepowderMage extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GalepowderMage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java b/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java index d7a31647a16..31c0bbbcf4b 100644 --- a/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java +++ b/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java @@ -51,7 +51,7 @@ public final class GargantuanGorilla extends CardImpl { // {T}: Gargantuan Gorilla deals damage equal to its power to another target creature. That creature deals damage equal to its power to Gargantuan Gorilla. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GargantuanGorillaFightEffect(), new TapSourceCost()); FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java b/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java index c0698ec16e5..c3675b96765 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java +++ b/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java @@ -37,7 +37,7 @@ public final class GarrukApexPredator extends CardImpl { static { filter.add(new CardTypePredicate(CardType.PLANESWALKER)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GarrukApexPredator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GarruksPackleader.java b/Mage.Sets/src/mage/cards/g/GarruksPackleader.java index 52fbd222054..92a47c10164 100644 --- a/Mage.Sets/src/mage/cards/g/GarruksPackleader.java +++ b/Mage.Sets/src/mage/cards/g/GarruksPackleader.java @@ -25,7 +25,7 @@ public final class GarruksPackleader extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("another creature with power 3 or greater"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 2)); } diff --git a/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java b/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java index f8d8ce3d8e5..17b8d03727f 100644 --- a/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java +++ b/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java @@ -24,7 +24,7 @@ public final class GavonyUnhallowed extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/g/GhituJourneymage.java b/Mage.Sets/src/mage/cards/g/GhituJourneymage.java index 2c7c677c62f..8075d92fd95 100644 --- a/Mage.Sets/src/mage/cards/g/GhituJourneymage.java +++ b/Mage.Sets/src/mage/cards/g/GhituJourneymage.java @@ -26,7 +26,7 @@ public final class GhituJourneymage extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Wizard"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.WIZARD)); } diff --git a/Mage.Sets/src/mage/cards/g/GlassdustHulk.java b/Mage.Sets/src/mage/cards/g/GlassdustHulk.java index 419a50f73a4..69c9f6c2bd5 100644 --- a/Mage.Sets/src/mage/cards/g/GlassdustHulk.java +++ b/Mage.Sets/src/mage/cards/g/GlassdustHulk.java @@ -30,7 +30,7 @@ public final class GlassdustHulk extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GlassdustHulk(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GlazeFiend.java b/Mage.Sets/src/mage/cards/g/GlazeFiend.java index b4e70d85d34..ca91ea31291 100644 --- a/Mage.Sets/src/mage/cards/g/GlazeFiend.java +++ b/Mage.Sets/src/mage/cards/g/GlazeFiend.java @@ -24,7 +24,7 @@ public final class GlazeFiend extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("another artifact"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java b/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java index d4b7a1630c2..4258c96d373 100644 --- a/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java +++ b/Mage.Sets/src/mage/cards/g/GlimmerpointStag.java @@ -33,7 +33,7 @@ public final class GlimmerpointStag extends CardImpl { private final static FilterPermanent filter = new FilterPermanent("another target permanent"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GlimmerpointStag(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java index 5352599b85e..ceb983bfbf0 100644 --- a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java +++ b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java @@ -28,7 +28,7 @@ public final class GlintHawkIdol extends CardImpl { private static final FilterPermanent filter = new FilterArtifactPermanent("another artifact"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GlintHawkIdol (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java b/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java index bdf07184766..1c355d90913 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java +++ b/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java @@ -28,7 +28,7 @@ public final class GoblinPiledriver extends CardImpl { static { filter.add(new SubtypePredicate(SubType.GOBLIN)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GoblinPiledriver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java index 8c844215c66..5b197248139 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java @@ -32,11 +32,11 @@ public final class GoblinRabblemaster extends CardImpl { private static final FilterCreaturePermanent attackingFilter = new FilterCreaturePermanent(SubType.GOBLIN, "other attacking Goblin"); static { - otherGoblinFilter.add(new AnotherPredicate()); + otherGoblinFilter.add(AnotherPredicate.instance); otherGoblinFilter.add(new ControllerPredicate(TargetController.YOU)); attackingFilter.add(new AttackingPredicate()); - attackingFilter.add(new AnotherPredicate()); + attackingFilter.add(AnotherPredicate.instance); } public GoblinRabblemaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java b/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java index 153484a72db..44a6fde8fd5 100644 --- a/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java +++ b/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java @@ -27,7 +27,7 @@ public final class GodheadOfAwe extends CardImpl { static { filter.add(new CardTypePredicate(CardType.CREATURE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GodheadOfAwe(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java b/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java index e57e96692dd..8087a50f4c6 100644 --- a/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java +++ b/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java @@ -32,7 +32,7 @@ public final class GodoBanditWarlord extends CardImpl { static { filter.add(new SubtypePredicate(SubType.EQUIPMENT)); - filter2.add(new AnotherPredicate()); + filter2.add(AnotherPredicate.instance); } public GodoBanditWarlord(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoldenGuardian.java b/Mage.Sets/src/mage/cards/g/GoldenGuardian.java index c96c531112d..3ec9d69dd6e 100644 --- a/Mage.Sets/src/mage/cards/g/GoldenGuardian.java +++ b/Mage.Sets/src/mage/cards/g/GoldenGuardian.java @@ -38,7 +38,7 @@ public final class GoldenGuardian extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GoldenGuardian(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoldnightRedeemer.java b/Mage.Sets/src/mage/cards/g/GoldnightRedeemer.java index 6291d17185c..856e6dfbc37 100644 --- a/Mage.Sets/src/mage/cards/g/GoldnightRedeemer.java +++ b/Mage.Sets/src/mage/cards/g/GoldnightRedeemer.java @@ -24,7 +24,7 @@ public final class GoldnightRedeemer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GoldnightRedeemer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GravenDominator.java b/Mage.Sets/src/mage/cards/g/GravenDominator.java index eb01ba0deeb..39db2926a72 100644 --- a/Mage.Sets/src/mage/cards/g/GravenDominator.java +++ b/Mage.Sets/src/mage/cards/g/GravenDominator.java @@ -23,7 +23,7 @@ public final class GravenDominator extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each other creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GravenDominator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GravityNegator.java b/Mage.Sets/src/mage/cards/g/GravityNegator.java index 77632558d05..17673de97b7 100644 --- a/Mage.Sets/src/mage/cards/g/GravityNegator.java +++ b/Mage.Sets/src/mage/cards/g/GravityNegator.java @@ -28,7 +28,7 @@ public final class GravityNegator extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GravityNegator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java index 858cdc62dfe..a84eff2d812 100644 --- a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java +++ b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java @@ -28,7 +28,7 @@ public final class GrimHaruspex extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another nontoken creature you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new TokenPredicate())); } diff --git a/Mage.Sets/src/mage/cards/g/GrimPoppet.java b/Mage.Sets/src/mage/cards/g/GrimPoppet.java index 4d2318472a1..2e4004752c9 100644 --- a/Mage.Sets/src/mage/cards/g/GrimPoppet.java +++ b/Mage.Sets/src/mage/cards/g/GrimPoppet.java @@ -28,7 +28,7 @@ public final class GrimPoppet extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GrimPoppet(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java b/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java index 3a6d2b65f77..6d292691d58 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java +++ b/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java @@ -30,7 +30,7 @@ public final class GrixisGrimblade extends CardImpl { static { filter.add(new MulticoloredPredicate()); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GrixisGrimblade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java b/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java index 22bdf8e337e..d5013b28788 100644 --- a/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java +++ b/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java @@ -64,7 +64,7 @@ class GrothamaAllDevouringGainAbilityEffect extends GainAbilityAllEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } GrothamaAllDevouringGainAbilityEffect() { diff --git a/Mage.Sets/src/mage/cards/g/GruulBeastmaster.java b/Mage.Sets/src/mage/cards/g/GruulBeastmaster.java index 3a3a7740206..c0e203c35b0 100644 --- a/Mage.Sets/src/mage/cards/g/GruulBeastmaster.java +++ b/Mage.Sets/src/mage/cards/g/GruulBeastmaster.java @@ -29,7 +29,7 @@ public final class GruulBeastmaster extends CardImpl { = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } private static final DynamicValue xValue = new SourcePermanentPowerCount(false); diff --git a/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java b/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java index b880b36706c..944497e356d 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java +++ b/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java @@ -26,7 +26,7 @@ public final class GuardianShieldBearer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public GuardianShieldBearer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GuardiansOfKoilos.java b/Mage.Sets/src/mage/cards/g/GuardiansOfKoilos.java index 792cbaca872..4d5d4e6d900 100644 --- a/Mage.Sets/src/mage/cards/g/GuardiansOfKoilos.java +++ b/Mage.Sets/src/mage/cards/g/GuardiansOfKoilos.java @@ -26,7 +26,7 @@ public final class GuardiansOfKoilos extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another historic permanent you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new HistoricPredicate()); } diff --git a/Mage.Sets/src/mage/cards/h/Halfdane.java b/Mage.Sets/src/mage/cards/h/Halfdane.java index 9c0972d6112..d837c5c9b7b 100644 --- a/Mage.Sets/src/mage/cards/h/Halfdane.java +++ b/Mage.Sets/src/mage/cards/h/Halfdane.java @@ -27,7 +27,7 @@ public final class Halfdane extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("target creature other than Halfdane"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public Halfdane(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HanSoloScrumrat.java b/Mage.Sets/src/mage/cards/h/HanSoloScrumrat.java index 9508f8e3189..27a92480897 100644 --- a/Mage.Sets/src/mage/cards/h/HanSoloScrumrat.java +++ b/Mage.Sets/src/mage/cards/h/HanSoloScrumrat.java @@ -31,7 +31,7 @@ public final class HanSoloScrumrat extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public HanSoloScrumrat(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HarbingerOfTheHunt.java b/Mage.Sets/src/mage/cards/h/HarbingerOfTheHunt.java index 48abb7cf9a3..59df8b1227e 100644 --- a/Mage.Sets/src/mage/cards/h/HarbingerOfTheHunt.java +++ b/Mage.Sets/src/mage/cards/h/HarbingerOfTheHunt.java @@ -29,7 +29,7 @@ public final class HarbingerOfTheHunt extends CardImpl { static { filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); filter2.add(new AbilityPredicate(FlyingAbility.class)); - filter2.add(new AnotherPredicate()); + filter2.add(AnotherPredicate.instance); } public HarbingerOfTheHunt(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HarvesterOfSouls.java b/Mage.Sets/src/mage/cards/h/HarvesterOfSouls.java index 92bf69c0b24..f184e8d3b73 100644 --- a/Mage.Sets/src/mage/cards/h/HarvesterOfSouls.java +++ b/Mage.Sets/src/mage/cards/h/HarvesterOfSouls.java @@ -24,7 +24,7 @@ public final class HarvesterOfSouls extends CardImpl { static { filter.add(Predicates.not(new TokenPredicate())); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public HarvesterOfSouls(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HavengulSkaab.java b/Mage.Sets/src/mage/cards/h/HavengulSkaab.java index 6953a576d72..7cd46a2b7c0 100644 --- a/Mage.Sets/src/mage/cards/h/HavengulSkaab.java +++ b/Mage.Sets/src/mage/cards/h/HavengulSkaab.java @@ -50,7 +50,7 @@ class HavengulSkaabAbility extends TriggeredAbilityImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public HavengulSkaabAbility() { diff --git a/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java b/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java index e2cf1d102dd..d04c6920f60 100644 --- a/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java +++ b/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java @@ -29,7 +29,7 @@ public final class HeadstrongBrute extends CardImpl { static { filter.add(new SubtypePredicate(SubType.PIRATE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public HeadstrongBrute(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeavenlyQilin.java b/Mage.Sets/src/mage/cards/h/HeavenlyQilin.java index 853fb730b87..1f3f0386ce2 100644 --- a/Mage.Sets/src/mage/cards/h/HeavenlyQilin.java +++ b/Mage.Sets/src/mage/cards/h/HeavenlyQilin.java @@ -24,7 +24,7 @@ public final class HeavenlyQilin extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public HeavenlyQilin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java b/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java index a5308cf18de..8e2fe33826a 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java @@ -28,7 +28,7 @@ public final class HeraldOfDromoka extends CardImpl { static { filter.add(new CardTypePredicate(CardType.CREATURE)); filter.add(new SubtypePredicate(SubType.WARRIOR)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public HeraldOfDromoka(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HerdGnarr.java b/Mage.Sets/src/mage/cards/h/HerdGnarr.java index 4bc79e2edc9..8fe90b62c83 100644 --- a/Mage.Sets/src/mage/cards/h/HerdGnarr.java +++ b/Mage.Sets/src/mage/cards/h/HerdGnarr.java @@ -23,7 +23,7 @@ public final class HerdGnarr extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public HerdGnarr(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java b/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java index 3f41bf6ec21..b8970974f37 100644 --- a/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java +++ b/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java @@ -27,7 +27,7 @@ public final class HerdchaserDragon extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other Dragon creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.DRAGON)); } diff --git a/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java b/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java index 9f9da602608..44a2ab40721 100644 --- a/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java +++ b/Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java @@ -32,7 +32,7 @@ public final class HighSentinelsOfArashin extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other creature you control with a +1/+1 counter on it"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/h/HisokasGuard.java b/Mage.Sets/src/mage/cards/h/HisokasGuard.java index c8479a741a9..0d11887e2aa 100644 --- a/Mage.Sets/src/mage/cards/h/HisokasGuard.java +++ b/Mage.Sets/src/mage/cards/h/HisokasGuard.java @@ -45,7 +45,7 @@ public final class HisokasGuard extends CardImpl { // {1}{U}, {T}: Target creature you control other than Hisoka's Guard has shroud for as long as Hisoka's Guard remains tapped. (It can't be the target of spells or abilities.) FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HisokasGuardGainAbilityTargetEffect(), new ManaCostsImpl("{1}{U}")); ability.addCost(new TapSourceCost()); Target target = new TargetControlledCreaturePermanent(1, 1, filter, true); diff --git a/Mage.Sets/src/mage/cards/h/HostageTaker.java b/Mage.Sets/src/mage/cards/h/HostageTaker.java index 9a5c0a29697..bf8e4cd7ba6 100644 --- a/Mage.Sets/src/mage/cards/h/HostageTaker.java +++ b/Mage.Sets/src/mage/cards/h/HostageTaker.java @@ -41,7 +41,7 @@ public final class HostageTaker extends CardImpl { private final static FilterPermanent filter = new FilterPermanent("another target artifact or creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.or( new CardTypePredicate(CardType.ARTIFACT), new CardTypePredicate(CardType.CREATURE))); diff --git a/Mage.Sets/src/mage/cards/h/HowlpackWolf.java b/Mage.Sets/src/mage/cards/h/HowlpackWolf.java index 9adf3013f0f..4f9376a4ff2 100644 --- a/Mage.Sets/src/mage/cards/h/HowlpackWolf.java +++ b/Mage.Sets/src/mage/cards/h/HowlpackWolf.java @@ -25,7 +25,7 @@ public final class HowlpackWolf extends CardImpl { static { filter.add(Predicates.or(new SubtypePredicate(SubType.WOLF), new SubtypePredicate(SubType.WEREWOLF))); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public HowlpackWolf(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java index 9f710caeca9..eaf0a24a51c 100644 --- a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java +++ b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java @@ -37,7 +37,7 @@ public final class IbHalfheartGoblinTactician extends CardImpl { static { filter.add(new SubtypePredicate(SubType.MOUNTAIN)); filterGoblin.add(new SubtypePredicate(SubType.GOBLIN)); - filterGoblin.add(new AnotherPredicate()); + filterGoblin.add(AnotherPredicate.instance); filterGoblin.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/i/IcefeatherAven.java b/Mage.Sets/src/mage/cards/i/IcefeatherAven.java index 215d29b039e..faec12790b0 100644 --- a/Mage.Sets/src/mage/cards/i/IcefeatherAven.java +++ b/Mage.Sets/src/mage/cards/i/IcefeatherAven.java @@ -26,7 +26,7 @@ public final class IcefeatherAven extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public IcefeatherAven(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/ImpassionedOrator.java b/Mage.Sets/src/mage/cards/i/ImpassionedOrator.java index cd7e4c34a1a..ef1a2f0991e 100644 --- a/Mage.Sets/src/mage/cards/i/ImpassionedOrator.java +++ b/Mage.Sets/src/mage/cards/i/ImpassionedOrator.java @@ -22,7 +22,7 @@ public final class ImpassionedOrator extends CardImpl { = new FilterControlledCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ImpassionedOrator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/ImpelledGiant.java b/Mage.Sets/src/mage/cards/i/ImpelledGiant.java index 123b3ebf006..15ab6c0d3f7 100644 --- a/Mage.Sets/src/mage/cards/i/ImpelledGiant.java +++ b/Mage.Sets/src/mage/cards/i/ImpelledGiant.java @@ -41,7 +41,7 @@ public final class ImpelledGiant extends CardImpl { static { filter.add(Predicates.not(new TappedPredicate())); filter.add(new ColorPredicate(ObjectColor.RED)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ImpelledGiant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/ImperialAerosaur.java b/Mage.Sets/src/mage/cards/i/ImperialAerosaur.java index 448afcc630d..1353a50288b 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialAerosaur.java +++ b/Mage.Sets/src/mage/cards/i/ImperialAerosaur.java @@ -29,7 +29,7 @@ public final class ImperialAerosaur extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ImperialAerosaur(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java index 418cb142f60..49e8926b2a5 100644 --- a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java +++ b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java @@ -50,7 +50,7 @@ public final class InallaArchmageRitualist extends CardImpl { static { filter.add(new SubtypePredicate(SubType.WIZARD)); filter.add(Predicates.not(new TokenPredicate())); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter2.add(new SubtypePredicate(SubType.WIZARD)); filter2.add(Predicates.not(new TappedPredicate())); } diff --git a/Mage.Sets/src/mage/cards/i/InspiringCommander.java b/Mage.Sets/src/mage/cards/i/InspiringCommander.java index ad50beeafcd..073076f25e6 100644 --- a/Mage.Sets/src/mage/cards/i/InspiringCommander.java +++ b/Mage.Sets/src/mage/cards/i/InspiringCommander.java @@ -27,7 +27,7 @@ public final class InspiringCommander extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("another creature with power 2 or less"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3)); } diff --git a/Mage.Sets/src/mage/cards/i/IntrepidProvisioner.java b/Mage.Sets/src/mage/cards/i/IntrepidProvisioner.java index e7c88c04160..35baafc5e97 100644 --- a/Mage.Sets/src/mage/cards/i/IntrepidProvisioner.java +++ b/Mage.Sets/src/mage/cards/i/IntrepidProvisioner.java @@ -25,7 +25,7 @@ public final class IntrepidProvisioner extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(SubType.HUMAN, "another target Human you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public IntrepidProvisioner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InvasiveSpecies.java b/Mage.Sets/src/mage/cards/i/InvasiveSpecies.java index 193d45dbd9c..3a2302b9373 100644 --- a/Mage.Sets/src/mage/cards/i/InvasiveSpecies.java +++ b/Mage.Sets/src/mage/cards/i/InvasiveSpecies.java @@ -21,7 +21,7 @@ public final class InvasiveSpecies extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another permanent you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public InvasiveSpecies(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IvyLaneDenizen.java b/Mage.Sets/src/mage/cards/i/IvyLaneDenizen.java index 56e556a59e9..b914b2dc360 100644 --- a/Mage.Sets/src/mage/cards/i/IvyLaneDenizen.java +++ b/Mage.Sets/src/mage/cards/i/IvyLaneDenizen.java @@ -27,7 +27,7 @@ public final class IvyLaneDenizen extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another green creature"); static { filter.add(new ColorPredicate(ObjectColor.GREEN)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public IvyLaneDenizen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/Ixidron.java b/Mage.Sets/src/mage/cards/i/Ixidron.java index 89fbe738556..4d070230bf8 100644 --- a/Mage.Sets/src/mage/cards/i/Ixidron.java +++ b/Mage.Sets/src/mage/cards/i/Ixidron.java @@ -32,7 +32,7 @@ public final class Ixidron extends CardImpl { static { filter.add(new FaceDownPredicate()); - filterTurnFaceDown.add(new AnotherPredicate()); + filterTurnFaceDown.add(AnotherPredicate.instance); filterTurnFaceDown.add(Predicates.not(new TokenPredicate())); } diff --git a/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java b/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java index 089eb700031..762da47ab12 100644 --- a/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java +++ b/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java @@ -30,7 +30,7 @@ public final class JaceTheLivingGuildpact extends CardImpl { private static final FilterPermanent filter = new FilterNonlandPermanent("another target nonland permanent"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public JaceTheLivingGuildpact(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JadeBearer.java b/Mage.Sets/src/mage/cards/j/JadeBearer.java index 9401aac3d9d..422df6fc88a 100644 --- a/Mage.Sets/src/mage/cards/j/JadeBearer.java +++ b/Mage.Sets/src/mage/cards/j/JadeBearer.java @@ -24,7 +24,7 @@ public final class JadeBearer extends CardImpl { private static final FilterCreaturePermanent filterYourAnotherMerfolk = new FilterCreaturePermanent(); static { - filterYourAnotherMerfolk.add(new AnotherPredicate()); + filterYourAnotherMerfolk.add(AnotherPredicate.instance); filterYourAnotherMerfolk.add(new SubtypePredicate(SubType.MERFOLK)); filterYourAnotherMerfolk.add(new ControllerPredicate(TargetController.YOU)); filterYourAnotherMerfolk.setMessage("another " + SubType.MERFOLK.toString() + " you control"); diff --git a/Mage.Sets/src/mage/cards/j/JediInstructor.java b/Mage.Sets/src/mage/cards/j/JediInstructor.java index 4665dabb37a..bcdfd16169b 100644 --- a/Mage.Sets/src/mage/cards/j/JediInstructor.java +++ b/Mage.Sets/src/mage/cards/j/JediInstructor.java @@ -25,7 +25,7 @@ public final class JediInstructor extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public JediInstructor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JediSentinel.java b/Mage.Sets/src/mage/cards/j/JediSentinel.java index 6fd1a7eda82..95eeddae9fe 100644 --- a/Mage.Sets/src/mage/cards/j/JediSentinel.java +++ b/Mage.Sets/src/mage/cards/j/JediSentinel.java @@ -30,7 +30,7 @@ public final class JediSentinel extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature you don't control"); static { - filter1.add(new AnotherPredicate()); + filter1.add(AnotherPredicate.instance); filter2.add(new ControllerPredicate(TargetController.NOT_YOU)); } diff --git a/Mage.Sets/src/mage/cards/j/JeeringInstigator.java b/Mage.Sets/src/mage/cards/j/JeeringInstigator.java index d0c8ab237b8..1e76e9844c8 100644 --- a/Mage.Sets/src/mage/cards/j/JeeringInstigator.java +++ b/Mage.Sets/src/mage/cards/j/JeeringInstigator.java @@ -31,7 +31,7 @@ public final class JeeringInstigator extends CardImpl { static final private FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public JeeringInstigator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JeskaiBarricade.java b/Mage.Sets/src/mage/cards/j/JeskaiBarricade.java index fa0dc3dfe63..061d5edb646 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiBarricade.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiBarricade.java @@ -27,7 +27,7 @@ public final class JeskaiBarricade extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java b/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java index 9ee16402ee5..7c888ff6bd7 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java +++ b/Mage.Sets/src/mage/cards/j/JoragaAuxiliary.java @@ -25,7 +25,7 @@ public final class JoragaAuxiliary extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other target creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public JoragaAuxiliary(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java b/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java index 6b89b86a4ba..c7751476a84 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java +++ b/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java @@ -32,7 +32,7 @@ public final class JoragaWarcaller extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new SubtypePredicate(SubType.ELF)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public JoragaWarcaller(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JourneyToNowhere.java b/Mage.Sets/src/mage/cards/j/JourneyToNowhere.java index d0253e3bde5..c10249f3ece 100644 --- a/Mage.Sets/src/mage/cards/j/JourneyToNowhere.java +++ b/Mage.Sets/src/mage/cards/j/JourneyToNowhere.java @@ -27,7 +27,7 @@ public final class JourneyToNowhere extends CardImpl { // When Journey to Nowhere enters the battlefield, exile target creature. FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); Ability ability1 = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect(), false); Target target = new TargetPermanent(filter); ability1.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/j/JubilantMascot.java b/Mage.Sets/src/mage/cards/j/JubilantMascot.java index 5e7df4e0496..299f93ea3df 100644 --- a/Mage.Sets/src/mage/cards/j/JubilantMascot.java +++ b/Mage.Sets/src/mage/cards/j/JubilantMascot.java @@ -27,7 +27,7 @@ public final class JubilantMascot extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other target creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public JubilantMascot(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JundHackblade.java b/Mage.Sets/src/mage/cards/j/JundHackblade.java index 21427f6d9f8..da37e5ab129 100644 --- a/Mage.Sets/src/mage/cards/j/JundHackblade.java +++ b/Mage.Sets/src/mage/cards/j/JundHackblade.java @@ -30,7 +30,7 @@ public final class JundHackblade extends CardImpl { static { filter.add(new MulticoloredPredicate()); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public JundHackblade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JuniperOrderRanger.java b/Mage.Sets/src/mage/cards/j/JuniperOrderRanger.java index f6efdbf90d3..4c343d6b5fb 100644 --- a/Mage.Sets/src/mage/cards/j/JuniperOrderRanger.java +++ b/Mage.Sets/src/mage/cards/j/JuniperOrderRanger.java @@ -25,7 +25,7 @@ public final class JuniperOrderRanger extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public JuniperOrderRanger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JwariShapeshifter.java b/Mage.Sets/src/mage/cards/j/JwariShapeshifter.java index e742dfd1acb..7eb7db49eb0 100644 --- a/Mage.Sets/src/mage/cards/j/JwariShapeshifter.java +++ b/Mage.Sets/src/mage/cards/j/JwariShapeshifter.java @@ -25,7 +25,7 @@ public final class JwariShapeshifter extends CardImpl { static { filter.add(new SubtypePredicate(SubType.ALLY)); filter.add(new CardTypePredicate(CardType.CREATURE)); - filter.add(new AnotherPredicate()); // needed because during enters_the_battlefield event the creature is already targetable although it shouldn't + filter.add(AnotherPredicate.instance); // needed because during enters_the_battlefield event the creature is already targetable although it shouldn't } public JwariShapeshifter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java index ff0708de288..a8dc5ad7567 100644 --- a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java +++ b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java @@ -37,7 +37,7 @@ public final class KalitasTraitorOfGhet extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another Vampire or Zombie"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.or(new SubtypePredicate(SubType.VAMPIRE), (new SubtypePredicate(SubType.ZOMBIE)))); } diff --git a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java index fcc5372b8c3..cdf9e48aaf3 100644 --- a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java +++ b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java @@ -36,7 +36,7 @@ public final class KangeeAerieKeeper extends CardImpl { static { filter.add(new SubtypePredicate(SubType.BIRD)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public KangeeAerieKeeper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java b/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java index d11a4fd48bf..949e636e44f 100644 --- a/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java +++ b/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java @@ -33,7 +33,7 @@ public final class KarrthusTyrantOfJund extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Dragon creatures you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.DRAGON)); } diff --git a/Mage.Sets/src/mage/cards/k/KavuMauler.java b/Mage.Sets/src/mage/cards/k/KavuMauler.java index ddfc95785e8..5b949f2284c 100644 --- a/Mage.Sets/src/mage/cards/k/KavuMauler.java +++ b/Mage.Sets/src/mage/cards/k/KavuMauler.java @@ -26,7 +26,7 @@ public final class KavuMauler extends CardImpl { static { filter.add(new SubtypePredicate(SubType.KAVU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public KavuMauler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KavuMonarch.java b/Mage.Sets/src/mage/cards/k/KavuMonarch.java index 9221978de69..0aebfe4a2cd 100644 --- a/Mage.Sets/src/mage/cards/k/KavuMonarch.java +++ b/Mage.Sets/src/mage/cards/k/KavuMonarch.java @@ -31,7 +31,7 @@ public final class KavuMonarch extends CardImpl { static { filter1.add(new SubtypePredicate(SubType.KAVU)); filter2.add(new SubtypePredicate(SubType.KAVU)); - filter2.add(new AnotherPredicate()); + filter2.add(AnotherPredicate.instance); } public KavuMonarch(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KederektLeviathan.java b/Mage.Sets/src/mage/cards/k/KederektLeviathan.java index cf0e32d9b95..b394b26e44a 100644 --- a/Mage.Sets/src/mage/cards/k/KederektLeviathan.java +++ b/Mage.Sets/src/mage/cards/k/KederektLeviathan.java @@ -22,7 +22,7 @@ public final class KederektLeviathan extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("all other nonland permanents"); static{ - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public KederektLeviathan(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KiAdiMundi.java b/Mage.Sets/src/mage/cards/k/KiAdiMundi.java index 6640a431129..63d42793a71 100644 --- a/Mage.Sets/src/mage/cards/k/KiAdiMundi.java +++ b/Mage.Sets/src/mage/cards/k/KiAdiMundi.java @@ -27,7 +27,7 @@ public final class KiAdiMundi extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/k/KillSwitch.java b/Mage.Sets/src/mage/cards/k/KillSwitch.java index 928d3f91e74..7c3d8248b81 100644 --- a/Mage.Sets/src/mage/cards/k/KillSwitch.java +++ b/Mage.Sets/src/mage/cards/k/KillSwitch.java @@ -29,7 +29,7 @@ public final class KillSwitch extends CardImpl { //static { - // filter.add(new AnotherPredicate()); + // filter.add(AnotherPredicate.instance); // } public KillSwitch(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KiorasFollower.java b/Mage.Sets/src/mage/cards/k/KiorasFollower.java index 05417a3b96b..d6a0b2eb138 100644 --- a/Mage.Sets/src/mage/cards/k/KiorasFollower.java +++ b/Mage.Sets/src/mage/cards/k/KiorasFollower.java @@ -25,7 +25,7 @@ public final class KiorasFollower extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another target permanent"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public KiorasFollower(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{U}"); diff --git a/Mage.Sets/src/mage/cards/k/KnightExemplar.java b/Mage.Sets/src/mage/cards/k/KnightExemplar.java index 17b9e9f765e..9c069322b69 100644 --- a/Mage.Sets/src/mage/cards/k/KnightExemplar.java +++ b/Mage.Sets/src/mage/cards/k/KnightExemplar.java @@ -43,7 +43,7 @@ public final class KnightExemplar extends CardImpl { // Other Knight creatures you control get +1/+1 and are indestructible. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); FilterCreaturePermanent indestructibleFilter = filter.copy(); - indestructibleFilter.add(new AnotherPredicate()); + indestructibleFilter.add(AnotherPredicate.instance); indestructibleFilter.add(new ControllerPredicate(TargetController.YOU)); indestructibleFilter.setMessage("Other Knight creatures you control"); Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, indestructibleFilter, false); diff --git a/Mage.Sets/src/mage/cards/k/KnightOfTheLastBreath.java b/Mage.Sets/src/mage/cards/k/KnightOfTheLastBreath.java index 8f4005c3f50..e0999f0923a 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfTheLastBreath.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfTheLastBreath.java @@ -30,7 +30,7 @@ public final class KnightOfTheLastBreath extends CardImpl { = new FilterControlledCreaturePermanent("another nontoken creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new TokenPredicate())); } diff --git a/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java b/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java index 1750aaad300..1542fc7bef7 100644 --- a/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java +++ b/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java @@ -34,7 +34,7 @@ public final class KumenaTyrantOfOrazca extends CardImpl { private static final FilterControlledPermanent filterAll = new FilterControlledPermanent("Merfolk you control"); static { - filterAnotherNotTapped.add(new AnotherPredicate()); + filterAnotherNotTapped.add(AnotherPredicate.instance); filterAnotherNotTapped.add(new SubtypePredicate(SubType.MERFOLK)); filterAnotherNotTapped.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/cards/k/KumenasSpeaker.java b/Mage.Sets/src/mage/cards/k/KumenasSpeaker.java index 90981f90196..58cc2dd7779 100644 --- a/Mage.Sets/src/mage/cards/k/KumenasSpeaker.java +++ b/Mage.Sets/src/mage/cards/k/KumenasSpeaker.java @@ -24,7 +24,7 @@ public final class KumenasSpeaker extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another Merfolk or an Island"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.or( new SubtypePredicate(SubType.ISLAND), new SubtypePredicate(SubType.MERFOLK))); diff --git a/Mage.Sets/src/mage/cards/l/LadySun.java b/Mage.Sets/src/mage/cards/l/LadySun.java index 8d9ca4863d3..255c43bbd81 100644 --- a/Mage.Sets/src/mage/cards/l/LadySun.java +++ b/Mage.Sets/src/mage/cards/l/LadySun.java @@ -28,7 +28,7 @@ public final class LadySun extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public LadySun(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LamplighterOfSelhoff.java b/Mage.Sets/src/mage/cards/l/LamplighterOfSelhoff.java index 20fcc00fcbf..b3930a952c7 100644 --- a/Mage.Sets/src/mage/cards/l/LamplighterOfSelhoff.java +++ b/Mage.Sets/src/mage/cards/l/LamplighterOfSelhoff.java @@ -26,7 +26,7 @@ public final class LamplighterOfSelhoff extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Zombie"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.ZOMBIE)); } diff --git a/Mage.Sets/src/mage/cards/l/LastLaugh.java b/Mage.Sets/src/mage/cards/l/LastLaugh.java index 1a35b3f9a08..14c712bfa31 100644 --- a/Mage.Sets/src/mage/cards/l/LastLaugh.java +++ b/Mage.Sets/src/mage/cards/l/LastLaugh.java @@ -27,7 +27,7 @@ public final class LastLaugh extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a permanent other than Last Laugh"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public LastLaugh(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java b/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java index bdb34d6533b..fa3f097a740 100644 --- a/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java +++ b/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java @@ -35,7 +35,7 @@ public final class LathlissDragonQueen extends CardImpl { static { filter.add(new SubtypePredicate(SubType.DRAGON)); filter.add(Predicates.not(new TokenPredicate())); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter2.add(new SubtypePredicate(SubType.DRAGON)); } diff --git a/Mage.Sets/src/mage/cards/l/LegionGuildmage.java b/Mage.Sets/src/mage/cards/l/LegionGuildmage.java index f0ef4685372..93dbb3cad04 100644 --- a/Mage.Sets/src/mage/cards/l/LegionGuildmage.java +++ b/Mage.Sets/src/mage/cards/l/LegionGuildmage.java @@ -27,7 +27,7 @@ public final class LegionGuildmage extends CardImpl { = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public LegionGuildmage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java b/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java index e3d9eea26ea..7e63ce8903c 100644 --- a/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java +++ b/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java @@ -86,7 +86,7 @@ class LiegeOfThePitEffect extends OneShotEffect { } FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature other than " + sourcePermanent.getName()); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); Target target = new TargetControlledCreaturePermanent(1, 1, filter, true); if (target.canChoose(source.getSourceId(), player.getId(), game)) { diff --git a/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java b/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java index c0ad532fb88..6989de1df3f 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java +++ b/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java @@ -32,7 +32,7 @@ public final class LilianaHereticalHealer extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new TokenPredicate())); } diff --git a/Mage.Sets/src/mage/cards/l/LivingTotem.java b/Mage.Sets/src/mage/cards/l/LivingTotem.java index 1f1eb84004a..7c63adb3c53 100644 --- a/Mage.Sets/src/mage/cards/l/LivingTotem.java +++ b/Mage.Sets/src/mage/cards/l/LivingTotem.java @@ -25,7 +25,7 @@ public final class LivingTotem extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public LivingTotem(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LordOfThePit.java b/Mage.Sets/src/mage/cards/l/LordOfThePit.java index 53a3a56b398..e957943c5a8 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfThePit.java +++ b/Mage.Sets/src/mage/cards/l/LordOfThePit.java @@ -78,7 +78,7 @@ class LordOfThePitEffect extends OneShotEffect { } FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature other than " + sourcePermanent.getName()); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); Target target = new TargetControlledCreaturePermanent(1, 1, filter, true); if (target.canChoose(source.getSourceId(), player.getId(), game)) { diff --git a/Mage.Sets/src/mage/cards/m/MadAuntie.java b/Mage.Sets/src/mage/cards/m/MadAuntie.java index 465facd99c9..8e3f29ce38f 100644 --- a/Mage.Sets/src/mage/cards/m/MadAuntie.java +++ b/Mage.Sets/src/mage/cards/m/MadAuntie.java @@ -31,7 +31,7 @@ public final class MadAuntie extends CardImpl { static { filter1.add(new SubtypePredicate(SubType.GOBLIN)); - filter1.add(new AnotherPredicate()); + filter1.add(AnotherPredicate.instance); } public MadAuntie(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MagetaTheLion.java b/Mage.Sets/src/mage/cards/m/MagetaTheLion.java index 1a665bf335c..ac3636dcf5c 100644 --- a/Mage.Sets/src/mage/cards/m/MagetaTheLion.java +++ b/Mage.Sets/src/mage/cards/m/MagetaTheLion.java @@ -31,7 +31,7 @@ public final class MagetaTheLion extends CardImpl { static { filter.add(new CardTypePredicate(CardType.CREATURE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public MagetaTheLion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MagisterOfWorth.java b/Mage.Sets/src/mage/cards/m/MagisterOfWorth.java index 289c1294458..4a0067ac5cf 100644 --- a/Mage.Sets/src/mage/cards/m/MagisterOfWorth.java +++ b/Mage.Sets/src/mage/cards/m/MagisterOfWorth.java @@ -92,7 +92,7 @@ class MagisterOfWorthVoteEffect extends OneShotEffect { new MagisterOfWorthReturnFromGraveyardEffect().apply(game, source); } else { FilterPermanent filter = new FilterCreaturePermanent("creatures other than {this}"); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); new DestroyAllEffect(filter).apply(game, source); } return true; diff --git a/Mage.Sets/src/mage/cards/m/MajesticHeliopterus.java b/Mage.Sets/src/mage/cards/m/MajesticHeliopterus.java index 3ce444d6cf8..a302dcb0e5e 100644 --- a/Mage.Sets/src/mage/cards/m/MajesticHeliopterus.java +++ b/Mage.Sets/src/mage/cards/m/MajesticHeliopterus.java @@ -27,7 +27,7 @@ public final class MajesticHeliopterus extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target Dinosaur you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.DINOSAUR)); } public MajesticHeliopterus(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java b/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java index dfe8f338075..63ce40b3c2f 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java @@ -24,7 +24,7 @@ public final class MaraudingBoneslasher extends CardImpl { static { filter.add(new SubtypePredicate(SubType.ZOMBIE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public MaraudingBoneslasher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MarkovCrusader.java b/Mage.Sets/src/mage/cards/m/MarkovCrusader.java index 9df87e68fc5..328a6f715fa 100644 --- a/Mage.Sets/src/mage/cards/m/MarkovCrusader.java +++ b/Mage.Sets/src/mage/cards/m/MarkovCrusader.java @@ -29,7 +29,7 @@ public final class MarkovCrusader extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another Vampire"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.VAMPIRE)); } diff --git a/Mage.Sets/src/mage/cards/m/MartonStromgald.java b/Mage.Sets/src/mage/cards/m/MartonStromgald.java index bc3a6cee4e0..1bfecf2a857 100644 --- a/Mage.Sets/src/mage/cards/m/MartonStromgald.java +++ b/Mage.Sets/src/mage/cards/m/MartonStromgald.java @@ -27,8 +27,8 @@ public final class MartonStromgald extends CardImpl { private static final FilterBlockingCreature blockingFilter = new FilterBlockingCreature("blocking creature other than {this}"); static { - attackingFilter.add(new AnotherPredicate()); - blockingFilter.add(new AnotherPredicate()); + attackingFilter.add(AnotherPredicate.instance); + blockingFilter.add(AnotherPredicate.instance); } public MartonStromgald(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MarwynTheNurturer.java b/Mage.Sets/src/mage/cards/m/MarwynTheNurturer.java index 8a237ea8793..353450b9829 100644 --- a/Mage.Sets/src/mage/cards/m/MarwynTheNurturer.java +++ b/Mage.Sets/src/mage/cards/m/MarwynTheNurturer.java @@ -25,7 +25,7 @@ public final class MarwynTheNurturer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another Elf"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.ELF)); } diff --git a/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java b/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java index 45ab9cb6320..8c17f8b06a9 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java @@ -28,7 +28,7 @@ public final class MausoleumHarpy extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java b/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java index a77aef89b91..b37f3779c8f 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java @@ -31,7 +31,7 @@ public final class MausoleumWanderer extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.SPIRIT)); } diff --git a/Mage.Sets/src/mage/cards/m/MentorOfTheMeek.java b/Mage.Sets/src/mage/cards/m/MentorOfTheMeek.java index 116cd617b66..7e007dec24e 100644 --- a/Mage.Sets/src/mage/cards/m/MentorOfTheMeek.java +++ b/Mage.Sets/src/mage/cards/m/MentorOfTheMeek.java @@ -28,7 +28,7 @@ public final class MentorOfTheMeek extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("another creature with power 2 or less"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3)); } diff --git a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java index 9845b838450..0e1dfd36cbb 100644 --- a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java +++ b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java @@ -32,7 +32,7 @@ public final class MerenOfClanNelToth extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/m/MidnightGuard.java b/Mage.Sets/src/mage/cards/m/MidnightGuard.java index b0c76111bcf..3019134b08f 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightGuard.java +++ b/Mage.Sets/src/mage/cards/m/MidnightGuard.java @@ -21,7 +21,7 @@ public final class MidnightGuard extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public MidnightGuard(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java b/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java index 5e0a0a04976..7f72fa46f41 100644 --- a/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java +++ b/Mage.Sets/src/mage/cards/m/MikaeusTheLunarch.java @@ -30,7 +30,7 @@ public final class MikaeusTheLunarch extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public MikaeusTheLunarch(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java b/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java index a8dabd9b207..154468baf30 100644 --- a/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java +++ b/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java @@ -92,7 +92,7 @@ class MinionLeshracEffect extends OneShotEffect { && minionLeshrac != null) { FilterControlledPermanent filterCreature = new FilterControlledPermanent(); filterCreature.add(new CardTypePredicate(CardType.CREATURE)); - filterCreature.add(new AnotherPredicate()); + filterCreature.add(AnotherPredicate.instance); TargetControlledPermanent target = new TargetControlledPermanent(filterCreature); SacrificeTargetCost cost = new SacrificeTargetCost(target); if (controller.chooseUse(Outcome.AIDontUseIt, "Do you wish to sacrifice another creature to prevent the 5 damage to you?", source, game) diff --git a/Mage.Sets/src/mage/cards/m/Mirrorworks.java b/Mage.Sets/src/mage/cards/m/Mirrorworks.java index 80d47816576..6adbdd1d58c 100644 --- a/Mage.Sets/src/mage/cards/m/Mirrorworks.java +++ b/Mage.Sets/src/mage/cards/m/Mirrorworks.java @@ -26,7 +26,7 @@ public final class Mirrorworks extends CardImpl { private final static FilterArtifactPermanent filter = new FilterArtifactPermanent("another nontoken artifact"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new TokenPredicate())); } diff --git a/Mage.Sets/src/mage/cards/m/MobileGarrison.java b/Mage.Sets/src/mage/cards/m/MobileGarrison.java index 35793906e41..3ebd7811e8f 100644 --- a/Mage.Sets/src/mage/cards/m/MobileGarrison.java +++ b/Mage.Sets/src/mage/cards/m/MobileGarrison.java @@ -27,7 +27,7 @@ public final class MobileGarrison extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another target artifact or creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.or( new CardTypePredicate(CardType.ARTIFACT), new CardTypePredicate(CardType.CREATURE) diff --git a/Mage.Sets/src/mage/cards/m/MoggBombers.java b/Mage.Sets/src/mage/cards/m/MoggBombers.java index 65700c1643e..b0635fc2ebd 100644 --- a/Mage.Sets/src/mage/cards/m/MoggBombers.java +++ b/Mage.Sets/src/mage/cards/m/MoggBombers.java @@ -26,7 +26,7 @@ public final class MoggBombers extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public MoggBombers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MoggSquad.java b/Mage.Sets/src/mage/cards/m/MoggSquad.java index c7b2934783e..d41435d187d 100644 --- a/Mage.Sets/src/mage/cards/m/MoggSquad.java +++ b/Mage.Sets/src/mage/cards/m/MoggSquad.java @@ -27,7 +27,7 @@ public final class MoggSquad extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each other creature on the battlefield"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public MoggSquad(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MorkrutNecropod.java b/Mage.Sets/src/mage/cards/m/MorkrutNecropod.java index 7bffaa9327f..08a609f0edb 100644 --- a/Mage.Sets/src/mage/cards/m/MorkrutNecropod.java +++ b/Mage.Sets/src/mage/cards/m/MorkrutNecropod.java @@ -27,7 +27,7 @@ public final class MorkrutNecropod extends CardImpl { filter.add(Predicates.or( new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.LAND))); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public MorkrutNecropod(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java b/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java index e0c45e08017..817bccc111b 100644 --- a/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java +++ b/Mage.Sets/src/mage/cards/m/MossbridgeTroll.java @@ -109,7 +109,7 @@ class MossbridgeTrollCost extends CostImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("any number of untapped creatures other than {this} with total power 10 or greater"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new TappedPredicate())); } diff --git a/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java b/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java index a8ff123ee6e..1d0ddf8e5c5 100644 --- a/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java +++ b/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java @@ -34,7 +34,7 @@ public final class MudbrawlerCohort extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.RED)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public MudbrawlerCohort(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MummyParamount.java b/Mage.Sets/src/mage/cards/m/MummyParamount.java index e48d48455c2..4555272f37d 100644 --- a/Mage.Sets/src/mage/cards/m/MummyParamount.java +++ b/Mage.Sets/src/mage/cards/m/MummyParamount.java @@ -23,7 +23,7 @@ public final class MummyParamount extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Zombie"); static { filter.add(new SubtypePredicate(SubType.ZOMBIE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public MummyParamount(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java b/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java index 923b7ab694b..6bad3165ae0 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java @@ -34,7 +34,7 @@ public final class MyojinOfCleansingFire extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public MyojinOfCleansingFire(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/N1Starfighter.java b/Mage.Sets/src/mage/cards/n/N1Starfighter.java index 85284b54fc9..bd50c4d84f7 100644 --- a/Mage.Sets/src/mage/cards/n/N1Starfighter.java +++ b/Mage.Sets/src/mage/cards/n/N1Starfighter.java @@ -28,7 +28,7 @@ public final class N1Starfighter extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public N1Starfighter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NayaHushblade.java b/Mage.Sets/src/mage/cards/n/NayaHushblade.java index 45c7ecb36e7..0c9cee189b3 100644 --- a/Mage.Sets/src/mage/cards/n/NayaHushblade.java +++ b/Mage.Sets/src/mage/cards/n/NayaHushblade.java @@ -30,7 +30,7 @@ public final class NayaHushblade extends CardImpl { static { filter.add(new MulticoloredPredicate()); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public NayaHushblade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NebulonBFrigate.java b/Mage.Sets/src/mage/cards/n/NebulonBFrigate.java index 2d318c7129f..ba7c2cf73d8 100644 --- a/Mage.Sets/src/mage/cards/n/NebulonBFrigate.java +++ b/Mage.Sets/src/mage/cards/n/NebulonBFrigate.java @@ -25,7 +25,7 @@ public final class NebulonBFrigate extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public NebulonBFrigate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NephaliaSmuggler.java b/Mage.Sets/src/mage/cards/n/NephaliaSmuggler.java index 5a69454d633..04135db5baf 100644 --- a/Mage.Sets/src/mage/cards/n/NephaliaSmuggler.java +++ b/Mage.Sets/src/mage/cards/n/NephaliaSmuggler.java @@ -25,7 +25,7 @@ public final class NephaliaSmuggler extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public NephaliaSmuggler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NessianWildsRavager.java b/Mage.Sets/src/mage/cards/n/NessianWildsRavager.java index 3cb5b250f23..1d5e7026cb2 100644 --- a/Mage.Sets/src/mage/cards/n/NessianWildsRavager.java +++ b/Mage.Sets/src/mage/cards/n/NessianWildsRavager.java @@ -25,7 +25,7 @@ public final class NessianWildsRavager extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public NessianWildsRavager(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NinthBridgePatrol.java b/Mage.Sets/src/mage/cards/n/NinthBridgePatrol.java index ebbcfc3ca77..1ba7fd421b9 100644 --- a/Mage.Sets/src/mage/cards/n/NinthBridgePatrol.java +++ b/Mage.Sets/src/mage/cards/n/NinthBridgePatrol.java @@ -26,7 +26,7 @@ public final class NinthBridgePatrol extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public NinthBridgePatrol(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NovablastWurm.java b/Mage.Sets/src/mage/cards/n/NovablastWurm.java index b61d7f32c3d..e8c8fc9e02e 100644 --- a/Mage.Sets/src/mage/cards/n/NovablastWurm.java +++ b/Mage.Sets/src/mage/cards/n/NovablastWurm.java @@ -22,7 +22,7 @@ public final class NovablastWurm extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new CardTypePredicate(CardType.CREATURE)); } diff --git a/Mage.Sets/src/mage/cards/n/NoxiousGearhulk.java b/Mage.Sets/src/mage/cards/n/NoxiousGearhulk.java index 9314df3c4a0..c41310dc4dd 100644 --- a/Mage.Sets/src/mage/cards/n/NoxiousGearhulk.java +++ b/Mage.Sets/src/mage/cards/n/NoxiousGearhulk.java @@ -28,7 +28,7 @@ public final class NoxiousGearhulk extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public NoxiousGearhulk(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java index a703139bb37..2d3aa09c5a7 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java +++ b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java @@ -91,7 +91,7 @@ class OathOfLimDulEffect extends OneShotEffect { private final static FilterControlledPermanent filter = new FilterControlledPermanent("controlled permanent other than Oath of Lim-Dul"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public OathOfLimDulEffect() { diff --git a/Mage.Sets/src/mage/cards/o/OathOfTeferi.java b/Mage.Sets/src/mage/cards/o/OathOfTeferi.java index 047d9447689..db292a88a07 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfTeferi.java +++ b/Mage.Sets/src/mage/cards/o/OathOfTeferi.java @@ -36,7 +36,7 @@ public final class OathOfTeferi extends CardImpl { private final static FilterControlledPermanent filter = new FilterControlledPermanent("another target permanent you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public OathOfTeferi(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OblivionRing.java b/Mage.Sets/src/mage/cards/o/OblivionRing.java index 8b5f3372239..8c4700b069f 100644 --- a/Mage.Sets/src/mage/cards/o/OblivionRing.java +++ b/Mage.Sets/src/mage/cards/o/OblivionRing.java @@ -27,7 +27,7 @@ public final class OblivionRing extends CardImpl { private static final FilterNonlandPermanent anotherNonlandPermanent = new FilterNonlandPermanent("another target nonland permanent"); static { - anotherNonlandPermanent.add(new AnotherPredicate()); + anotherNonlandPermanent.add(AnotherPredicate.instance); } public OblivionRing(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OgreBattledriver.java b/Mage.Sets/src/mage/cards/o/OgreBattledriver.java index 59f1085d22f..4986765662d 100644 --- a/Mage.Sets/src/mage/cards/o/OgreBattledriver.java +++ b/Mage.Sets/src/mage/cards/o/OgreBattledriver.java @@ -30,7 +30,7 @@ public final class OgreBattledriver extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } private static final String rule = "Whenever another creature enters the battlefield under your control, that creature gets +2/+0 and gains haste until end of turn."; diff --git a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java index 475c981d675..15bc7453659 100644 --- a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java +++ b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java @@ -32,7 +32,7 @@ public final class OgreSlumlord extends CardImpl { private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("Rats you control"); static { filter.add(Predicates.not(new TokenPredicate())); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter2.add(new SubtypePredicate(SubType.RAT)); } diff --git a/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java b/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java index 6e5a6763ed6..c221c91dc24 100644 --- a/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java +++ b/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java @@ -36,7 +36,7 @@ public final class OliviaVoldaren extends CardImpl { private static final FilterCreaturePermanent vampireFilter = new FilterCreaturePermanent("Vampire"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); vampireFilter.add(new SubtypePredicate(SubType.VAMPIRE)); } diff --git a/Mage.Sets/src/mage/cards/o/Opalescence.java b/Mage.Sets/src/mage/cards/o/Opalescence.java index 8037d645d00..40319bcfcdb 100644 --- a/Mage.Sets/src/mage/cards/o/Opalescence.java +++ b/Mage.Sets/src/mage/cards/o/Opalescence.java @@ -52,7 +52,7 @@ class OpalescenceEffect extends ContinuousEffectImpl { static { filter.add(Predicates.not(new SubtypePredicate(SubType.AURA))); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); checkDependencyTypes = EnumSet.of(DependencyType.AuraAddingRemoving, DependencyType.EnchantmentAddingRemoving); } diff --git a/Mage.Sets/src/mage/cards/o/OrcGeneral.java b/Mage.Sets/src/mage/cards/o/OrcGeneral.java index b2d290e3e53..792b222f8a5 100644 --- a/Mage.Sets/src/mage/cards/o/OrcGeneral.java +++ b/Mage.Sets/src/mage/cards/o/OrcGeneral.java @@ -33,7 +33,7 @@ public final class OrcGeneral extends CardImpl { static { filterOrcOrGoblin.add(Predicates.or(new SubtypePredicate(SubType.ORC), new SubtypePredicate(SubType.GOBLIN))); - filterOrcOrGoblin.add(new AnotherPredicate()); + filterOrcOrGoblin.add(AnotherPredicate.instance); filterOrc.add(new SubtypePredicate(SubType.ORC)); } diff --git a/Mage.Sets/src/mage/cards/o/OrcSureshot.java b/Mage.Sets/src/mage/cards/o/OrcSureshot.java index 80c5d978b37..f499838e56c 100644 --- a/Mage.Sets/src/mage/cards/o/OrcSureshot.java +++ b/Mage.Sets/src/mage/cards/o/OrcSureshot.java @@ -29,7 +29,7 @@ public final class OrcSureshot extends CardImpl { private static final FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/o/OrchardWarden.java b/Mage.Sets/src/mage/cards/o/OrchardWarden.java index da5336125e2..cd77dd9b47b 100644 --- a/Mage.Sets/src/mage/cards/o/OrchardWarden.java +++ b/Mage.Sets/src/mage/cards/o/OrchardWarden.java @@ -26,7 +26,7 @@ public final class OrchardWarden extends CardImpl { static { filter.add(new SubtypePredicate(SubType.TREEFOLK)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public OrchardWarden(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/Paleoloth.java b/Mage.Sets/src/mage/cards/p/Paleoloth.java index 2a702d824ec..a7650a5bbeb 100644 --- a/Mage.Sets/src/mage/cards/p/Paleoloth.java +++ b/Mage.Sets/src/mage/cards/p/Paleoloth.java @@ -28,7 +28,7 @@ public final class Paleoloth extends CardImpl { static { filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 4)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } private static final String rule = "Whenever another creature with power 5 or greater enters the battlefield under your control, you may return target creature card from your graveyard to your hand."; diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java index 572ffc20ec4..c470aa6daec 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java @@ -39,7 +39,7 @@ public final class ParagonOfEternalWilds extends CardImpl { filterGreen.add(new ColorPredicate(ObjectColor.GREEN)); filterGreen.add(new ControllerPredicate(TargetController.YOU)); filterGreen2.add(new ColorPredicate(ObjectColor.GREEN)); - filterGreen2.add(new AnotherPredicate()); + filterGreen2.add(AnotherPredicate.instance); } public ParagonOfEternalWilds(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java b/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java index c1fb7a9296a..d88970bc0b5 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java @@ -35,7 +35,7 @@ public final class ParagonOfFierceDefiance extends CardImpl { static { filterCreatures.add(new ColorPredicate(ObjectColor.RED)); - filterCreature.add(new AnotherPredicate()); + filterCreature.add(AnotherPredicate.instance); filterCreature.add(new ColorPredicate(ObjectColor.RED)); } diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java index 17c8b02393c..c25d4921ded 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java @@ -39,7 +39,7 @@ public final class ParagonOfGatheringMists extends CardImpl { filterBlue.add(new ColorPredicate(ObjectColor.BLUE)); filterBlue.add(new ControllerPredicate(TargetController.YOU)); filterBlue2.add(new ColorPredicate(ObjectColor.BLUE)); - filterBlue2.add(new AnotherPredicate()); + filterBlue2.add(AnotherPredicate.instance); } public ParagonOfGatheringMists(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java index 7ae03275b0f..a186d548cb0 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java @@ -37,7 +37,7 @@ public final class ParagonOfNewDawns extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.WHITE)); filter.add(new ControllerPredicate(TargetController.YOU)); - filter2.add(new AnotherPredicate()); + filter2.add(AnotherPredicate.instance); filter2.add(new ColorPredicate(ObjectColor.WHITE)); filter2.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java b/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java index d8a89099933..a23b31ee287 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java @@ -35,7 +35,7 @@ public final class ParagonOfOpenGraves extends CardImpl { static { filterCreatures.add(new ColorPredicate(ObjectColor.BLACK)); - filterCreature.add(new AnotherPredicate()); + filterCreature.add(AnotherPredicate.instance); filterCreature.add(new ColorPredicate(ObjectColor.BLACK)); } diff --git a/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java b/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java index 7ce316dfdd6..6792fca6dad 100644 --- a/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java +++ b/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java @@ -29,7 +29,7 @@ public final class PeacewalkerColossus extends CardImpl { private static final FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("another target vehicle"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.VEHICLE)); } diff --git a/Mage.Sets/src/mage/cards/p/PegasusCourser.java b/Mage.Sets/src/mage/cards/p/PegasusCourser.java index 0388865a9c0..6dbfdc659f7 100644 --- a/Mage.Sets/src/mage/cards/p/PegasusCourser.java +++ b/Mage.Sets/src/mage/cards/p/PegasusCourser.java @@ -25,7 +25,7 @@ public final class PegasusCourser extends CardImpl { static final FilterAttackingCreature filter = new FilterAttackingCreature("another target attacking creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public PegasusCourser(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianDreadnought.java b/Mage.Sets/src/mage/cards/p/PhyrexianDreadnought.java index afb9c707089..41900f0ee1f 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianDreadnought.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianDreadnought.java @@ -56,7 +56,7 @@ class PhyrexianDreadnoughtSacrificeCost extends CostImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("any number of creatures with total power 12 or greater"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public PhyrexianDreadnoughtSacrificeCost() { diff --git a/Mage.Sets/src/mage/cards/p/PiousEvangel.java b/Mage.Sets/src/mage/cards/p/PiousEvangel.java index 3cf2046a8a3..917a03a500e 100644 --- a/Mage.Sets/src/mage/cards/p/PiousEvangel.java +++ b/Mage.Sets/src/mage/cards/p/PiousEvangel.java @@ -33,7 +33,7 @@ public final class PiousEvangel extends CardImpl { private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("another permanent"); static { - filter2.add(new AnotherPredicate()); + filter2.add(AnotherPredicate.instance); } public PiousEvangel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java b/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java index fa3228ce6a4..b4667a3b49b 100644 --- a/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java +++ b/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java @@ -24,7 +24,7 @@ public final class PitilessPlunderer extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/p/PlagueBelcher.java b/Mage.Sets/src/mage/cards/p/PlagueBelcher.java index e042dcf7eb6..65ef7f718d6 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueBelcher.java +++ b/Mage.Sets/src/mage/cards/p/PlagueBelcher.java @@ -32,7 +32,7 @@ public final class PlagueBelcher extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new SubtypePredicate(SubType.ZOMBIE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public PlagueBelcher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PoisonbellyOgre.java b/Mage.Sets/src/mage/cards/p/PoisonbellyOgre.java index 866517b846a..23b359686f8 100644 --- a/Mage.Sets/src/mage/cards/p/PoisonbellyOgre.java +++ b/Mage.Sets/src/mage/cards/p/PoisonbellyOgre.java @@ -22,7 +22,7 @@ public final class PoisonbellyOgre extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } private final static String RULE = "Whenever another creature enters the battlefield, its controller loses 1 life."; diff --git a/Mage.Sets/src/mage/cards/p/PontiffOfBlight.java b/Mage.Sets/src/mage/cards/p/PontiffOfBlight.java index 19a3aa1248a..d7f18675a4a 100644 --- a/Mage.Sets/src/mage/cards/p/PontiffOfBlight.java +++ b/Mage.Sets/src/mage/cards/p/PontiffOfBlight.java @@ -28,7 +28,7 @@ public final class PontiffOfBlight extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Other creatures you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java index ab9ce5f0c48..9ac6fc59b9f 100644 --- a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java +++ b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java @@ -31,7 +31,7 @@ public final class PrideOfTheClouds extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creature with flying on the battlefield"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new AbilityPredicate(FlyingAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/p/PrideSovereign.java b/Mage.Sets/src/mage/cards/p/PrideSovereign.java index 42f476571a0..929c2d2b731 100644 --- a/Mage.Sets/src/mage/cards/p/PrideSovereign.java +++ b/Mage.Sets/src/mage/cards/p/PrideSovereign.java @@ -38,7 +38,7 @@ public final class PrideSovereign extends CardImpl { // Pride Sovereign gets +1/+1 for each other Cat you control. FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(SubType.CAT, "other Cat you control"); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); DynamicValue otherCats = new PermanentsOnBattlefieldCount(filter); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(otherCats, otherCats, Duration.WhileOnBattlefield))); // {W}, {t}, Exert Pride Sovereign: Create two 1/1 white Cat creature tokens with lifelink. diff --git a/Mage.Sets/src/mage/cards/p/PriestOfForgottenGods.java b/Mage.Sets/src/mage/cards/p/PriestOfForgottenGods.java index 8d033faeb3e..801350a032c 100644 --- a/Mage.Sets/src/mage/cards/p/PriestOfForgottenGods.java +++ b/Mage.Sets/src/mage/cards/p/PriestOfForgottenGods.java @@ -32,7 +32,7 @@ public final class PriestOfForgottenGods extends CardImpl { = new FilterControlledCreaturePermanent("other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public PriestOfForgottenGods(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PrimalForcemage.java b/Mage.Sets/src/mage/cards/p/PrimalForcemage.java index 2a17cceae86..c1e50b811e9 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalForcemage.java +++ b/Mage.Sets/src/mage/cards/p/PrimalForcemage.java @@ -27,7 +27,7 @@ public final class PrimalForcemage extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } private static final String rule = "Whenever another creature enters the battlefield under your control, that creature gets +3/+3 until end of turn."; diff --git a/Mage.Sets/src/mage/cards/p/PrimevalProtector.java b/Mage.Sets/src/mage/cards/p/PrimevalProtector.java index c68fabb66ad..7a09b0723b9 100644 --- a/Mage.Sets/src/mage/cards/p/PrimevalProtector.java +++ b/Mage.Sets/src/mage/cards/p/PrimevalProtector.java @@ -36,7 +36,7 @@ public final class PrimevalProtector extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public PrimevalProtector(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PrincessLeia.java b/Mage.Sets/src/mage/cards/p/PrincessLeia.java index 3a47d9e3ea4..9bcae9ff497 100644 --- a/Mage.Sets/src/mage/cards/p/PrincessLeia.java +++ b/Mage.Sets/src/mage/cards/p/PrincessLeia.java @@ -30,7 +30,7 @@ public final class PrincessLeia extends CardImpl { static { SubtypePredicate rebel = new SubtypePredicate(SubType.REBEL); - filter1.add(new AnotherPredicate()); + filter1.add(AnotherPredicate.instance); filter1.add(rebel); filter2.add(rebel); } diff --git a/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java b/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java index f642c2b466e..9e4c6e287e3 100644 --- a/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java +++ b/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java @@ -25,7 +25,7 @@ public final class ProwessOfTheFair extends CardImpl { static { filter.add(new SubtypePredicate(SubType.ELF)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new TokenPredicate())); } diff --git a/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java b/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java index ad1bc787fa0..31c7ecc8676 100644 --- a/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java +++ b/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java @@ -27,7 +27,7 @@ public final class PurphorosGodOfTheForge extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public PurphorosGodOfTheForge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/q/Quickling.java b/Mage.Sets/src/mage/cards/q/Quickling.java index abc6ffa7e7b..4f409074ec3 100644 --- a/Mage.Sets/src/mage/cards/q/Quickling.java +++ b/Mage.Sets/src/mage/cards/q/Quickling.java @@ -60,7 +60,7 @@ class QuicklingEffect extends OneShotEffect { private static final String effectText = "sacrifice it unless you return another creature you control to its owner's hand"; static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } QuicklingEffect() { diff --git a/Mage.Sets/src/mage/cards/r/RadiantArchangel.java b/Mage.Sets/src/mage/cards/r/RadiantArchangel.java index e75d2d19a8a..263c3f97797 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantArchangel.java +++ b/Mage.Sets/src/mage/cards/r/RadiantArchangel.java @@ -29,7 +29,7 @@ public final class RadiantArchangel extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creature with flying on the battlefield"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new AbilityPredicate(FlyingAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/r/RageForger.java b/Mage.Sets/src/mage/cards/r/RageForger.java index b840f2e7fe4..fb10108d1d3 100644 --- a/Mage.Sets/src/mage/cards/r/RageForger.java +++ b/Mage.Sets/src/mage/cards/r/RageForger.java @@ -38,7 +38,7 @@ public final class RageForger extends CardImpl { static { filter.add(new SubtypePredicate(SubType.SHAMAN)); filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filterAttack.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/r/RagingSwordtooth.java b/Mage.Sets/src/mage/cards/r/RagingSwordtooth.java index 4b5253d56a0..5856a612a88 100644 --- a/Mage.Sets/src/mage/cards/r/RagingSwordtooth.java +++ b/Mage.Sets/src/mage/cards/r/RagingSwordtooth.java @@ -22,7 +22,7 @@ public final class RagingSwordtooth extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("other creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public RagingSwordtooth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RampagingFerocidon.java b/Mage.Sets/src/mage/cards/r/RampagingFerocidon.java index f0403fa0109..939e7eea412 100644 --- a/Mage.Sets/src/mage/cards/r/RampagingFerocidon.java +++ b/Mage.Sets/src/mage/cards/r/RampagingFerocidon.java @@ -34,7 +34,7 @@ public final class RampagingFerocidon extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public RampagingFerocidon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/Ramroller.java b/Mage.Sets/src/mage/cards/r/Ramroller.java index f2574f04848..297bd6a6150 100644 --- a/Mage.Sets/src/mage/cards/r/Ramroller.java +++ b/Mage.Sets/src/mage/cards/r/Ramroller.java @@ -27,7 +27,7 @@ public final class Ramroller extends CardImpl { private static final FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public Ramroller(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RatColony.java b/Mage.Sets/src/mage/cards/r/RatColony.java index fefee4c8146..86b6a1d5c24 100644 --- a/Mage.Sets/src/mage/cards/r/RatColony.java +++ b/Mage.Sets/src/mage/cards/r/RatColony.java @@ -28,7 +28,7 @@ public final class RatColony extends CardImpl { static { filter.add(new SubtypePredicate(SubType.RAT)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public RatColony(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/ReaperKing.java b/Mage.Sets/src/mage/cards/r/ReaperKing.java index ee8a6ef8b86..e3d65bef519 100644 --- a/Mage.Sets/src/mage/cards/r/ReaperKing.java +++ b/Mage.Sets/src/mage/cards/r/ReaperKing.java @@ -27,7 +27,7 @@ public final class ReaperKing extends CardImpl { static { filter.add(new SubtypePredicate(SubType.SCARECROW)); - filterTrigger.add(new AnotherPredicate()); + filterTrigger.add(AnotherPredicate.instance); filterTrigger.add(new SubtypePredicate(SubType.SCARECROW)); } diff --git a/Mage.Sets/src/mage/cards/r/ReaverDrone.java b/Mage.Sets/src/mage/cards/r/ReaverDrone.java index 0a373538548..2ed17709da2 100644 --- a/Mage.Sets/src/mage/cards/r/ReaverDrone.java +++ b/Mage.Sets/src/mage/cards/r/ReaverDrone.java @@ -28,7 +28,7 @@ public final class ReaverDrone extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another colorless creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ColorlessPredicate()); } diff --git a/Mage.Sets/src/mage/cards/r/RecklessBushwhacker.java b/Mage.Sets/src/mage/cards/r/RecklessBushwhacker.java index 0e83f3b7fcd..d19cf75607c 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessBushwhacker.java +++ b/Mage.Sets/src/mage/cards/r/RecklessBushwhacker.java @@ -27,7 +27,7 @@ public final class RecklessBushwhacker extends CardImpl { private final static FilterControlledCreaturePermanent FILTER = new FilterControlledCreaturePermanent("other creatures you control"); static { - FILTER.add(new AnotherPredicate()); + FILTER.add(AnotherPredicate.instance); } public RecklessBushwhacker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RecklessCohort.java b/Mage.Sets/src/mage/cards/r/RecklessCohort.java index ec4d153313c..4962f5b3ce8 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessCohort.java +++ b/Mage.Sets/src/mage/cards/r/RecklessCohort.java @@ -24,7 +24,7 @@ public final class RecklessCohort extends CardImpl { private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another Ally"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.ALLY)); } diff --git a/Mage.Sets/src/mage/cards/r/ReclusiveWight.java b/Mage.Sets/src/mage/cards/r/ReclusiveWight.java index 01995437b14..936f3a340a9 100644 --- a/Mage.Sets/src/mage/cards/r/ReclusiveWight.java +++ b/Mage.Sets/src/mage/cards/r/ReclusiveWight.java @@ -27,7 +27,7 @@ public final class ReclusiveWight extends CardImpl { static { filter.add(Predicates.not(new CardTypePredicate(CardType.LAND))); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ReclusiveWight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RenegadeKrasis.java b/Mage.Sets/src/mage/cards/r/RenegadeKrasis.java index 95a9aceeef3..e692bdb62c7 100644 --- a/Mage.Sets/src/mage/cards/r/RenegadeKrasis.java +++ b/Mage.Sets/src/mage/cards/r/RenegadeKrasis.java @@ -52,7 +52,7 @@ class RenegadeKrasisTriggeredAbility extends TriggeredAbilityImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/r/RequiemAngel.java b/Mage.Sets/src/mage/cards/r/RequiemAngel.java index 7e7efb10e2c..178164eab77 100644 --- a/Mage.Sets/src/mage/cards/r/RequiemAngel.java +++ b/Mage.Sets/src/mage/cards/r/RequiemAngel.java @@ -27,7 +27,7 @@ public final class RequiemAngel extends CardImpl { static { filter.add(Predicates.not(new SubtypePredicate(SubType.SPIRIT))); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java b/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java index 7428ba1dce1..cdb37cef16d 100644 --- a/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java +++ b/Mage.Sets/src/mage/cards/r/RhonasTheIndomitable.java @@ -34,7 +34,7 @@ public final class RhonasTheIndomitable extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public RhonasTheIndomitable(UUID ownerId, CardSetInfo setInfo) { @@ -105,7 +105,7 @@ class RhonasTheIndomitableRestrictionEffect extends RestrictionEffect { public boolean applies(Permanent permanent, Ability source, Game game) { FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 3)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); if (permanent.getId().equals(source.getSourceId())) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { diff --git a/Mage.Sets/src/mage/cards/r/RidgescaleTusker.java b/Mage.Sets/src/mage/cards/r/RidgescaleTusker.java index aad9662f1d4..47deb75e59a 100644 --- a/Mage.Sets/src/mage/cards/r/RidgescaleTusker.java +++ b/Mage.Sets/src/mage/cards/r/RidgescaleTusker.java @@ -22,7 +22,7 @@ public final class RidgescaleTusker extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public RidgescaleTusker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java b/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java index de22cb3cc4f..9f00625efdc 100644 --- a/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java +++ b/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java @@ -33,7 +33,7 @@ public final class RikuOfTwoReflections extends CardImpl { new CardTypePredicate(CardType.INSTANT), new CardTypePredicate(CardType.SORCERY))); filterPermanent.add(Predicates.not(new TokenPredicate())); - filterPermanent.add(new AnotherPredicate()); + filterPermanent.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/r/RimehornAurochs.java b/Mage.Sets/src/mage/cards/r/RimehornAurochs.java index 09fca54defa..2bd9a9401d8 100644 --- a/Mage.Sets/src/mage/cards/r/RimehornAurochs.java +++ b/Mage.Sets/src/mage/cards/r/RimehornAurochs.java @@ -33,7 +33,7 @@ public final class RimehornAurochs extends CardImpl { static { filter.add(new AttackingPredicate()); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public RimehornAurochs(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RiverSneak.java b/Mage.Sets/src/mage/cards/r/RiverSneak.java index ccb15f52abd..ce86dc98cf0 100644 --- a/Mage.Sets/src/mage/cards/r/RiverSneak.java +++ b/Mage.Sets/src/mage/cards/r/RiverSneak.java @@ -27,7 +27,7 @@ public final class RiverSneak extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another Merfolk"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new SubtypePredicate(SubType.MERFOLK)); } diff --git a/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java b/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java index 99e6b0c3a62..22072f622de 100644 --- a/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java +++ b/Mage.Sets/src/mage/cards/r/RoonOfTheHiddenRealm.java @@ -38,7 +38,7 @@ public final class RoonOfTheHiddenRealm extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public RoonOfTheHiddenRealm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RotShambler.java b/Mage.Sets/src/mage/cards/r/RotShambler.java index b719faaf28c..8358cd49b08 100644 --- a/Mage.Sets/src/mage/cards/r/RotShambler.java +++ b/Mage.Sets/src/mage/cards/r/RotShambler.java @@ -24,7 +24,7 @@ public final class RotShambler extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/r/RustElemental.java b/Mage.Sets/src/mage/cards/r/RustElemental.java index a7ae9da7f5e..d6893f89802 100644 --- a/Mage.Sets/src/mage/cards/r/RustElemental.java +++ b/Mage.Sets/src/mage/cards/r/RustElemental.java @@ -53,7 +53,7 @@ class RustElementalEffect extends OneShotEffect { private static final FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("artifact"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public RustElementalEffect() { diff --git a/Mage.Sets/src/mage/cards/s/SaddlebackLagac.java b/Mage.Sets/src/mage/cards/s/SaddlebackLagac.java index e962f95c8b2..70c1b8ab3e2 100644 --- a/Mage.Sets/src/mage/cards/s/SaddlebackLagac.java +++ b/Mage.Sets/src/mage/cards/s/SaddlebackLagac.java @@ -23,7 +23,7 @@ public final class SaddlebackLagac extends CardImpl { private final static FilterCreaturePermanent FILTER = new FilterCreaturePermanent("target creatures"); static { - FILTER.add(new AnotherPredicate()); + FILTER.add(AnotherPredicate.instance); } public SaddlebackLagac(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java b/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java index ca6f76b1090..2d69340779a 100644 --- a/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java +++ b/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java @@ -29,7 +29,7 @@ public final class SagesRowDenizen extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.BLUE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java b/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java index 233d60d5f93..3329be28191 100644 --- a/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java +++ b/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java @@ -51,7 +51,7 @@ class SaltRoadAmbushersTriggeredAbility extends TurnedFaceUpAllTriggeredAbility private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another permanent you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public SaltRoadAmbushersTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/s/Saltskitter.java b/Mage.Sets/src/mage/cards/s/Saltskitter.java index 6c73c55ab05..e97c2651aea 100644 --- a/Mage.Sets/src/mage/cards/s/Saltskitter.java +++ b/Mage.Sets/src/mage/cards/s/Saltskitter.java @@ -22,7 +22,7 @@ public final class Saltskitter extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public Saltskitter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java b/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java index a5fb791345e..d42b0d88745 100644 --- a/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java +++ b/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java @@ -36,8 +36,8 @@ public final class SamutVoiceOfDissent extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); - filter2.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); + filter2.add(AnotherPredicate.instance); } public SamutVoiceOfDissent(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java b/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java index 996c9946c3a..24b24ee0569 100644 --- a/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java +++ b/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java @@ -31,7 +31,7 @@ public final class SanctifierOfSouls extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public SanctifierOfSouls(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SanguineGlorifier.java b/Mage.Sets/src/mage/cards/s/SanguineGlorifier.java index be19360531b..df998da5726 100644 --- a/Mage.Sets/src/mage/cards/s/SanguineGlorifier.java +++ b/Mage.Sets/src/mage/cards/s/SanguineGlorifier.java @@ -25,7 +25,7 @@ public final class SanguineGlorifier extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another target Vampire you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.VAMPIRE)); } diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java b/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java index ec103fb903e..56a7d280b34 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java @@ -30,7 +30,7 @@ public final class ScourgeOfKherRidges extends CardImpl { static { filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); filter2.add(new AbilityPredicate(FlyingAbility.class)); - filter2.add(new AnotherPredicate()); + filter2.add(AnotherPredicate.instance); } public ScourgeOfKherRidges(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScroungingBandar.java b/Mage.Sets/src/mage/cards/s/ScroungingBandar.java index 13c98760f37..c9421d3b053 100644 --- a/Mage.Sets/src/mage/cards/s/ScroungingBandar.java +++ b/Mage.Sets/src/mage/cards/s/ScroungingBandar.java @@ -32,7 +32,7 @@ public final class ScroungingBandar extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ScroungingBandar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java b/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java index a1668e7278d..c0edd5cad96 100644 --- a/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java +++ b/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java @@ -28,7 +28,7 @@ public final class SekKuarDeathkeeper extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new TokenPredicate())); } diff --git a/Mage.Sets/src/mage/cards/s/SelvalaHeartOfTheWilds.java b/Mage.Sets/src/mage/cards/s/SelvalaHeartOfTheWilds.java index 8b1325c6187..7ef32df750e 100644 --- a/Mage.Sets/src/mage/cards/s/SelvalaHeartOfTheWilds.java +++ b/Mage.Sets/src/mage/cards/s/SelvalaHeartOfTheWilds.java @@ -35,7 +35,7 @@ public final class SelvalaHeartOfTheWilds extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } private static final String rule = "Whenever another creature enters the battlefield, its controller may draw a card if its power is greater than each other creature's power."; diff --git a/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java b/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java index b0ff816b465..2b1808a1f96 100644 --- a/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java +++ b/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java @@ -26,7 +26,7 @@ public final class SerendibSorcerer extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature other than {this}"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public SerendibSorcerer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SetessanTactics.java b/Mage.Sets/src/mage/cards/s/SetessanTactics.java index 20cbc8d6bbc..51e2b69656a 100644 --- a/Mage.Sets/src/mage/cards/s/SetessanTactics.java +++ b/Mage.Sets/src/mage/cards/s/SetessanTactics.java @@ -28,7 +28,7 @@ public final class SetessanTactics extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public SetessanTactics(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShadowAlleyDenizen.java b/Mage.Sets/src/mage/cards/s/ShadowAlleyDenizen.java index 7efd4395a89..99013be6f09 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowAlleyDenizen.java +++ b/Mage.Sets/src/mage/cards/s/ShadowAlleyDenizen.java @@ -29,7 +29,7 @@ public final class ShadowAlleyDenizen extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.BLACK)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ShadowAlleyDenizen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShaleskinBruiser.java b/Mage.Sets/src/mage/cards/s/ShaleskinBruiser.java index 1b093b930cf..c666d6d3bfe 100644 --- a/Mage.Sets/src/mage/cards/s/ShaleskinBruiser.java +++ b/Mage.Sets/src/mage/cards/s/ShaleskinBruiser.java @@ -27,7 +27,7 @@ public final class ShaleskinBruiser extends CardImpl { static { filter.add(new SubtypePredicate(SubType.BEAST)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/s/ShaperApprentice.java b/Mage.Sets/src/mage/cards/s/ShaperApprentice.java index 32fa83dc11e..69e437c9265 100644 --- a/Mage.Sets/src/mage/cards/s/ShaperApprentice.java +++ b/Mage.Sets/src/mage/cards/s/ShaperApprentice.java @@ -28,7 +28,7 @@ public final class ShaperApprentice extends CardImpl { static { filter.add(new SubtypePredicate(SubType.MERFOLK)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ShaperApprentice(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java b/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java index 7ed79f033b0..1a700a7b3cf 100644 --- a/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java +++ b/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java @@ -72,7 +72,7 @@ public final class ShaukuEndbringer extends CardImpl{ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ShaukuEndbringerEffect() { diff --git a/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java b/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java index b89b5bde7d1..68d416731e1 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java +++ b/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java @@ -27,7 +27,7 @@ public final class ShieldhideDragon extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other Dragon creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.DRAGON)); } diff --git a/Mage.Sets/src/mage/cards/s/ShriekingMogg.java b/Mage.Sets/src/mage/cards/s/ShriekingMogg.java index 63260a809a4..2df0930767c 100644 --- a/Mage.Sets/src/mage/cards/s/ShriekingMogg.java +++ b/Mage.Sets/src/mage/cards/s/ShriekingMogg.java @@ -23,7 +23,7 @@ public final class ShriekingMogg extends CardImpl { static final FilterCreaturePermanent filter = new FilterCreaturePermanent("all other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ShriekingMogg(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SickleDancer.java b/Mage.Sets/src/mage/cards/s/SickleDancer.java index ec80b693b90..c5d70a1f745 100644 --- a/Mage.Sets/src/mage/cards/s/SickleDancer.java +++ b/Mage.Sets/src/mage/cards/s/SickleDancer.java @@ -24,7 +24,7 @@ public final class SickleDancer extends CardImpl { private static final FilterTeamPermanent filter = new FilterTeamPermanent(SubType.WARRIOR, "Warrior creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public SickleDancer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java b/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java index fd5064b8613..e9aef0e4534 100644 --- a/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java +++ b/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java @@ -28,7 +28,7 @@ public final class SifterOfSkulls extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another nontoken creature you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new TokenPredicate())); } diff --git a/Mage.Sets/src/mage/cards/s/Skitterskin.java b/Mage.Sets/src/mage/cards/s/Skitterskin.java index a61b9b0d392..8659145a304 100644 --- a/Mage.Sets/src/mage/cards/s/Skitterskin.java +++ b/Mage.Sets/src/mage/cards/s/Skitterskin.java @@ -28,7 +28,7 @@ public final class Skitterskin extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("you control another colorless creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ColorlessPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/SkyriderPatrol.java b/Mage.Sets/src/mage/cards/s/SkyriderPatrol.java index 25fde9c0a68..c7119a81835 100644 --- a/Mage.Sets/src/mage/cards/s/SkyriderPatrol.java +++ b/Mage.Sets/src/mage/cards/s/SkyriderPatrol.java @@ -95,7 +95,7 @@ class SkyriderPatrolReflexiveTriggeredAbility extends DelayedTriggeredAbility { = new FilterControlledCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public SkyriderPatrolReflexiveTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/s/SliverLegion.java b/Mage.Sets/src/mage/cards/s/SliverLegion.java index 37aa4dc6754..16e7d5dc518 100644 --- a/Mage.Sets/src/mage/cards/s/SliverLegion.java +++ b/Mage.Sets/src/mage/cards/s/SliverLegion.java @@ -24,7 +24,7 @@ public final class SliverLegion extends CardImpl { private static final FilterPermanent countfilter = new FilterPermanent(SubType.SLIVER, "other Sliver on the battlefield"); static { - countfilter.add(new AnotherPredicate()); + countfilter.add(AnotherPredicate.instance); } public SliverLegion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SludgeStrider.java b/Mage.Sets/src/mage/cards/s/SludgeStrider.java index 219edc42f9a..fb389b73932 100644 --- a/Mage.Sets/src/mage/cards/s/SludgeStrider.java +++ b/Mage.Sets/src/mage/cards/s/SludgeStrider.java @@ -61,7 +61,7 @@ class SludgeStriderTriggeredAbility extends TriggeredAbilityImpl { private static final FilterArtifactCard filter = new FilterArtifactCard("another artifact under your control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public SludgeStriderTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/s/SorceressQueen.java b/Mage.Sets/src/mage/cards/s/SorceressQueen.java index f3b81ce4496..e455408d290 100644 --- a/Mage.Sets/src/mage/cards/s/SorceressQueen.java +++ b/Mage.Sets/src/mage/cards/s/SorceressQueen.java @@ -26,7 +26,7 @@ public final class SorceressQueen extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature other than {this}"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public SorceressQueen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SoulOfTheHarvest.java b/Mage.Sets/src/mage/cards/s/SoulOfTheHarvest.java index 76a157f25db..bdcd6c6ff5b 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfTheHarvest.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfTheHarvest.java @@ -25,7 +25,7 @@ public final class SoulOfTheHarvest extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("another nontoken creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new TokenPredicate())); } diff --git a/Mage.Sets/src/mage/cards/s/SoulWarden.java b/Mage.Sets/src/mage/cards/s/SoulWarden.java index 79c309845f3..c95ae0e8758 100644 --- a/Mage.Sets/src/mage/cards/s/SoulWarden.java +++ b/Mage.Sets/src/mage/cards/s/SoulWarden.java @@ -22,7 +22,7 @@ public final class SoulWarden extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public SoulWarden(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SoulsAttendant.java b/Mage.Sets/src/mage/cards/s/SoulsAttendant.java index fc40b463031..fbdc7aeb6cd 100644 --- a/Mage.Sets/src/mage/cards/s/SoulsAttendant.java +++ b/Mage.Sets/src/mage/cards/s/SoulsAttendant.java @@ -22,7 +22,7 @@ public final class SoulsAttendant extends CardImpl { private static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public SoulsAttendant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SoultetherGolem.java b/Mage.Sets/src/mage/cards/s/SoultetherGolem.java index 7028c37c7fd..73d60c1aab6 100644 --- a/Mage.Sets/src/mage/cards/s/SoultetherGolem.java +++ b/Mage.Sets/src/mage/cards/s/SoultetherGolem.java @@ -30,7 +30,7 @@ public final class SoultetherGolem extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public SoultetherGolem(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StagBeetle.java b/Mage.Sets/src/mage/cards/s/StagBeetle.java index 4918fae8bfe..4da1d698ec7 100644 --- a/Mage.Sets/src/mage/cards/s/StagBeetle.java +++ b/Mage.Sets/src/mage/cards/s/StagBeetle.java @@ -23,7 +23,7 @@ public final class StagBeetle extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public StagBeetle(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StalkingVengeance.java b/Mage.Sets/src/mage/cards/s/StalkingVengeance.java index 5b1347dac6a..b51f4e9fcce 100644 --- a/Mage.Sets/src/mage/cards/s/StalkingVengeance.java +++ b/Mage.Sets/src/mage/cards/s/StalkingVengeance.java @@ -31,7 +31,7 @@ public final class StalkingVengeance extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public StalkingVengeance(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StampedingHorncrest.java b/Mage.Sets/src/mage/cards/s/StampedingHorncrest.java index 78d5d1f5ba2..3a9cd4b932f 100644 --- a/Mage.Sets/src/mage/cards/s/StampedingHorncrest.java +++ b/Mage.Sets/src/mage/cards/s/StampedingHorncrest.java @@ -27,7 +27,7 @@ public final class StampedingHorncrest extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another Dinosaur"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.DINOSAUR)); } diff --git a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java index 8ab8ec89da0..1ad2c7e2f39 100644 --- a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java +++ b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java @@ -80,7 +80,7 @@ class StarfieldOfNyxEffect extends ContinuousEffectImpl { static { filter.add(Predicates.not(new SubtypePredicate(SubType.AURA))); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java b/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java index feeccfd132e..692a6e4c256 100644 --- a/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java +++ b/Mage.Sets/src/mage/cards/s/SteelcladSerpent.java @@ -51,7 +51,7 @@ class SteelcladSerpentEffect extends RestrictionEffect { static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public SteelcladSerpentEffect() { diff --git a/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java b/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java index cdfdd7e3779..fbd63a49a5c 100644 --- a/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java +++ b/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java @@ -29,7 +29,7 @@ public final class StonehoofChieftain extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public StonehoofChieftain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StormwingDragon.java b/Mage.Sets/src/mage/cards/s/StormwingDragon.java index c03b2124fd1..b5d89492458 100644 --- a/Mage.Sets/src/mage/cards/s/StormwingDragon.java +++ b/Mage.Sets/src/mage/cards/s/StormwingDragon.java @@ -27,7 +27,7 @@ public final class StormwingDragon extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other Dragon creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.DRAGON)); } diff --git a/Mage.Sets/src/mage/cards/s/StromkirkMentor.java b/Mage.Sets/src/mage/cards/s/StromkirkMentor.java index 7dc780d5d67..187ba8c4389 100644 --- a/Mage.Sets/src/mage/cards/s/StromkirkMentor.java +++ b/Mage.Sets/src/mage/cards/s/StromkirkMentor.java @@ -25,7 +25,7 @@ public final class StromkirkMentor extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another target Vampire you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.VAMPIRE)); } diff --git a/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java b/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java index 9d1cd7d2056..55157dfa6ee 100644 --- a/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java +++ b/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java @@ -29,7 +29,7 @@ public final class SunCrestedPterodon extends CardImpl { private static final FilterControlledCreaturePermanent filterAnotherDino = new FilterControlledCreaturePermanent(); static { - filterAnotherDino.add(new AnotherPredicate()); + filterAnotherDino.add(AnotherPredicate.instance); filterAnotherDino.add(new SubtypePredicate(SubType.DINOSAUR)); } diff --git a/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java b/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java index 38d7bedb37b..e9a0bec6af2 100644 --- a/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java +++ b/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java @@ -32,7 +32,7 @@ public final class SunstrikeLegionnaire extends CardImpl { private static final FilterCreaturePermanent tapFilter = new FilterCreaturePermanent("creature with converted mana cost 3 or less"); static { - untapFilter.add(new AnotherPredicate()); + untapFilter.add(AnotherPredicate.instance); tapFilter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); } diff --git a/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java b/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java index faa291400c4..a396479913d 100644 --- a/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java +++ b/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java @@ -30,7 +30,7 @@ public final class TajicLegionsEdge extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("other creatures you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public TajicLegionsEdge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TemurSabertooth.java b/Mage.Sets/src/mage/cards/t/TemurSabertooth.java index 7a454c9851b..f4802c71440 100644 --- a/Mage.Sets/src/mage/cards/t/TemurSabertooth.java +++ b/Mage.Sets/src/mage/cards/t/TemurSabertooth.java @@ -56,7 +56,7 @@ class TemurSabertoothEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public TemurSabertoothEffect() { diff --git a/Mage.Sets/src/mage/cards/t/TenthDistrictVeteran.java b/Mage.Sets/src/mage/cards/t/TenthDistrictVeteran.java index 4d9ffcd2427..53b0b20d970 100644 --- a/Mage.Sets/src/mage/cards/t/TenthDistrictVeteran.java +++ b/Mage.Sets/src/mage/cards/t/TenthDistrictVeteran.java @@ -23,7 +23,7 @@ public final class TenthDistrictVeteran extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public TenthDistrictVeteran(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TerritorialAllosaurus.java b/Mage.Sets/src/mage/cards/t/TerritorialAllosaurus.java index b13f74ec870..7c748d0d62f 100644 --- a/Mage.Sets/src/mage/cards/t/TerritorialAllosaurus.java +++ b/Mage.Sets/src/mage/cards/t/TerritorialAllosaurus.java @@ -39,7 +39,7 @@ public final class TerritorialAllosaurus extends CardImpl { Ability conditionalAbility = new ConditionalInterveningIfTriggeredAbility(ability, KickedCondition.instance, "When {this} enters the battlefield, if it was kicked, it fights another target creature."); FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); conditionalAbility.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(conditionalAbility); } diff --git a/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java b/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java index ecf320e2bbd..41a5b34afd5 100644 --- a/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java +++ b/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java @@ -37,7 +37,7 @@ public final class TeysaOrzhovScion extends CardImpl { static { filterWhite.add(new ColorPredicate(ObjectColor.WHITE)); filterBlack.add(new ColorPredicate(ObjectColor.BLACK)); - filterBlack.add(new AnotherPredicate()); + filterBlack.add(AnotherPredicate.instance); filterBlack.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/t/ThaliasLieutenant.java b/Mage.Sets/src/mage/cards/t/ThaliasLieutenant.java index 2187bbb32cd..27a8ccc8629 100644 --- a/Mage.Sets/src/mage/cards/t/ThaliasLieutenant.java +++ b/Mage.Sets/src/mage/cards/t/ThaliasLieutenant.java @@ -25,7 +25,7 @@ public final class ThaliasLieutenant extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("each other Human you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.HUMAN)); } diff --git a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java index 28494795648..cc66e70e131 100644 --- a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java +++ b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java @@ -35,7 +35,7 @@ public final class ThatWhichWasTaken extends CardImpl { private static final FilterPermanent filterIndestructible = new FilterPermanent("Each permanent with a divinity counter on it"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filterIndestructible.add(new CounterPredicate(CounterType.DIVINITY)); } diff --git a/Mage.Sets/src/mage/cards/t/TheScorpionGod.java b/Mage.Sets/src/mage/cards/t/TheScorpionGod.java index 5a8d67ad423..b06dc525cb8 100644 --- a/Mage.Sets/src/mage/cards/t/TheScorpionGod.java +++ b/Mage.Sets/src/mage/cards/t/TheScorpionGod.java @@ -43,7 +43,7 @@ public final class TheScorpionGod extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public TheScorpionGod(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThopterAssembly.java b/Mage.Sets/src/mage/cards/t/ThopterAssembly.java index e75e7c18d5f..4d7b3a82548 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterAssembly.java +++ b/Mage.Sets/src/mage/cards/t/ThopterAssembly.java @@ -57,7 +57,7 @@ class ThopterAssemblyTriggeredAbility extends TriggeredAbilityImpl { private static final FilterPermanent filter = new FilterPermanent(); static { filter.add(new SubtypePredicate(SubType.THOPTER)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } ThopterAssemblyTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/t/ThopterSquadron.java b/Mage.Sets/src/mage/cards/t/ThopterSquadron.java index a87ca4db82d..924f154435f 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterSquadron.java +++ b/Mage.Sets/src/mage/cards/t/ThopterSquadron.java @@ -34,7 +34,7 @@ public final class ThopterSquadron extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another Thopter"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.THOPTER)); } diff --git a/Mage.Sets/src/mage/cards/t/ThousandWinds.java b/Mage.Sets/src/mage/cards/t/ThousandWinds.java index 5cdbcdf9f94..5d1d868f0c6 100644 --- a/Mage.Sets/src/mage/cards/t/ThousandWinds.java +++ b/Mage.Sets/src/mage/cards/t/ThousandWinds.java @@ -25,7 +25,7 @@ public final class ThousandWinds extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other tapped creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new TappedPredicate()); } diff --git a/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java b/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java index eadd8fee03a..e4267e9f10c 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java +++ b/Mage.Sets/src/mage/cards/t/ThrashOfRaptors.java @@ -30,7 +30,7 @@ public final class ThrashOfRaptors extends CardImpl { static { filter.add(new SubtypePredicate(SubType.DINOSAUR)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public ThrashOfRaptors(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java b/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java index 6d47ec49c5d..da507b1d91a 100644 --- a/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java +++ b/Mage.Sets/src/mage/cards/t/ThundercloudElemental.java @@ -31,7 +31,7 @@ public final class ThundercloudElemental extends CardImpl { static { toughnessFilter.add(new ToughnessPredicate(ComparisonType.FEWER_THAN, 3)); - flyingFilter.add(new AnotherPredicate()); + flyingFilter.add(AnotherPredicate.instance); } public ThundercloudElemental(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/Thundermare.java b/Mage.Sets/src/mage/cards/t/Thundermare.java index 4ceaec87069..e62e638d66c 100644 --- a/Mage.Sets/src/mage/cards/t/Thundermare.java +++ b/Mage.Sets/src/mage/cards/t/Thundermare.java @@ -22,7 +22,7 @@ public final class Thundermare extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public Thundermare(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TideforceElemental.java b/Mage.Sets/src/mage/cards/t/TideforceElemental.java index 61a0188763f..bad10be690e 100644 --- a/Mage.Sets/src/mage/cards/t/TideforceElemental.java +++ b/Mage.Sets/src/mage/cards/t/TideforceElemental.java @@ -29,7 +29,7 @@ public final class TideforceElemental extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public TideforceElemental(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TilonallisSkinshifter.java b/Mage.Sets/src/mage/cards/t/TilonallisSkinshifter.java index 10785877a3b..744235947a4 100644 --- a/Mage.Sets/src/mage/cards/t/TilonallisSkinshifter.java +++ b/Mage.Sets/src/mage/cards/t/TilonallisSkinshifter.java @@ -35,7 +35,7 @@ public final class TilonallisSkinshifter extends CardImpl { static { filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY))); filter.add(new AttackingPredicate()); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public TilonallisSkinshifter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TimberProtector.java b/Mage.Sets/src/mage/cards/t/TimberProtector.java index dd89cb5e594..05cb0d722ef 100644 --- a/Mage.Sets/src/mage/cards/t/TimberProtector.java +++ b/Mage.Sets/src/mage/cards/t/TimberProtector.java @@ -34,7 +34,7 @@ public final class TimberProtector extends CardImpl { filterBoth.add(Predicates.or( new SubtypePredicate(SubType.TREEFOLK), new SubtypePredicate(SubType.FOREST))); - filterBoth.add(new AnotherPredicate()); + filterBoth.add(AnotherPredicate.instance); } public TimberProtector(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/Timbermare.java b/Mage.Sets/src/mage/cards/t/Timbermare.java index 6cbecc485fe..db606b0db44 100644 --- a/Mage.Sets/src/mage/cards/t/Timbermare.java +++ b/Mage.Sets/src/mage/cards/t/Timbermare.java @@ -23,7 +23,7 @@ public final class Timbermare extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public Timbermare(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TimidDrake.java b/Mage.Sets/src/mage/cards/t/TimidDrake.java index 9dbbb37c52e..bc6f6b50aa1 100644 --- a/Mage.Sets/src/mage/cards/t/TimidDrake.java +++ b/Mage.Sets/src/mage/cards/t/TimidDrake.java @@ -23,7 +23,7 @@ public final class TimidDrake extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public TimidDrake(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TorchCourier.java b/Mage.Sets/src/mage/cards/t/TorchCourier.java index 24566bcde9e..a6588460f4c 100644 --- a/Mage.Sets/src/mage/cards/t/TorchCourier.java +++ b/Mage.Sets/src/mage/cards/t/TorchCourier.java @@ -27,7 +27,7 @@ public final class TorchCourier extends CardImpl { = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public TorchCourier(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TrainedCondor.java b/Mage.Sets/src/mage/cards/t/TrainedCondor.java index 5e81c9de5d1..b9e4259faa7 100644 --- a/Mage.Sets/src/mage/cards/t/TrainedCondor.java +++ b/Mage.Sets/src/mage/cards/t/TrainedCondor.java @@ -26,7 +26,7 @@ public final class TrainedCondor extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public TrainedCondor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); diff --git a/Mage.Sets/src/mage/cards/t/TranquilGrove.java b/Mage.Sets/src/mage/cards/t/TranquilGrove.java index c8f3a0a6296..7687d4b236e 100644 --- a/Mage.Sets/src/mage/cards/t/TranquilGrove.java +++ b/Mage.Sets/src/mage/cards/t/TranquilGrove.java @@ -22,7 +22,7 @@ public final class TranquilGrove extends CardImpl { private static final FilterPermanent filter = new FilterEnchantmentPermanent("other enchantments"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public TranquilGrove(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TriadOfFates.java b/Mage.Sets/src/mage/cards/t/TriadOfFates.java index c77fe608b65..472b1da334e 100644 --- a/Mage.Sets/src/mage/cards/t/TriadOfFates.java +++ b/Mage.Sets/src/mage/cards/t/TriadOfFates.java @@ -39,7 +39,7 @@ public final class TriadOfFates extends CardImpl { private static final FilterCreaturePermanent filterCounter = new FilterCreaturePermanent("creature that has a fate counter on it"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filterCounter.add(new CounterPredicate(CounterType.FATE)); } diff --git a/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java b/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java index 32ae265ad15..aa1c8b6ab3d 100644 --- a/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java +++ b/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java @@ -78,9 +78,9 @@ class UlashtTheHateSeedEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filterRed = new FilterControlledCreaturePermanent(); static { - filterGreen.add(new AnotherPredicate()); + filterGreen.add(AnotherPredicate.instance); filterGreen.add(new ColorPredicate(ObjectColor.GREEN)); - filterRed.add(new AnotherPredicate()); + filterRed.add(AnotherPredicate.instance); filterRed.add(new ColorPredicate(ObjectColor.RED)); } diff --git a/Mage.Sets/src/mage/cards/u/UnbenderTine.java b/Mage.Sets/src/mage/cards/u/UnbenderTine.java index b2b522d3b0a..8e76b2c3e4e 100644 --- a/Mage.Sets/src/mage/cards/u/UnbenderTine.java +++ b/Mage.Sets/src/mage/cards/u/UnbenderTine.java @@ -26,7 +26,7 @@ public final class UnbenderTine extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another target permanent"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public UnbenderTine(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UndercityNecrolisk.java b/Mage.Sets/src/mage/cards/u/UndercityNecrolisk.java index f1adb8461a8..d90196c35f6 100644 --- a/Mage.Sets/src/mage/cards/u/UndercityNecrolisk.java +++ b/Mage.Sets/src/mage/cards/u/UndercityNecrolisk.java @@ -31,7 +31,7 @@ public final class UndercityNecrolisk extends CardImpl { = new FilterControlledCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public UndercityNecrolisk(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UndercityScavenger.java b/Mage.Sets/src/mage/cards/u/UndercityScavenger.java index e04ca55d23e..ea0af3458e5 100644 --- a/Mage.Sets/src/mage/cards/u/UndercityScavenger.java +++ b/Mage.Sets/src/mage/cards/u/UndercityScavenger.java @@ -26,7 +26,7 @@ public final class UndercityScavenger extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public UndercityScavenger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UnrulyMob.java b/Mage.Sets/src/mage/cards/u/UnrulyMob.java index 6ae0fb34826..7777945b626 100644 --- a/Mage.Sets/src/mage/cards/u/UnrulyMob.java +++ b/Mage.Sets/src/mage/cards/u/UnrulyMob.java @@ -24,7 +24,7 @@ public final class UnrulyMob extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/u/UnstableShapeshifter.java b/Mage.Sets/src/mage/cards/u/UnstableShapeshifter.java index 99bf8748627..7b29054aaaa 100644 --- a/Mage.Sets/src/mage/cards/u/UnstableShapeshifter.java +++ b/Mage.Sets/src/mage/cards/u/UnstableShapeshifter.java @@ -30,7 +30,7 @@ public final class UnstableShapeshifter extends CardImpl { final static FilterCreaturePermanent filterAnotherCreature = new FilterCreaturePermanent("another creature"); static { - filterAnotherCreature.add(new AnotherPredicate()); + filterAnotherCreature.add(AnotherPredicate.instance); } public UnstableShapeshifter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java b/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java index c0848ff167c..e7723d4f9ff 100644 --- a/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java +++ b/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java @@ -114,7 +114,7 @@ class VesuvanShapeshifterEffect extends OneShotEffect { Permanent copyToCreature = game.getPermanent(source.getSourceId()); if (copyToCreature != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); TargetCreaturePermanent target = new TargetCreaturePermanent(0, 1, filter, false); diff --git a/Mage.Sets/src/mage/cards/v/VeteranWarleader.java b/Mage.Sets/src/mage/cards/v/VeteranWarleader.java index c2ec926461c..fa02fdbda5e 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranWarleader.java +++ b/Mage.Sets/src/mage/cards/v/VeteranWarleader.java @@ -42,7 +42,7 @@ public final class VeteranWarleader extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another untapped Ally you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SubtypePredicate(SubType.ALLY)); filter.add(Predicates.not(new TappedPredicate())); } diff --git a/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java b/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java index 8ffc9d4ec97..3b02d878dd9 100644 --- a/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java +++ b/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java @@ -29,7 +29,7 @@ public final class VizierOfTumblingSands extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another target permanent"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public VizierOfTumblingSands(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VoidGrafter.java b/Mage.Sets/src/mage/cards/v/VoidGrafter.java index af9e959b4e0..c4b6d62e0f2 100644 --- a/Mage.Sets/src/mage/cards/v/VoidGrafter.java +++ b/Mage.Sets/src/mage/cards/v/VoidGrafter.java @@ -27,7 +27,7 @@ public final class VoidGrafter extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public VoidGrafter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VoldarenPariah.java b/Mage.Sets/src/mage/cards/v/VoldarenPariah.java index 1f4be360d2d..f810467d907 100644 --- a/Mage.Sets/src/mage/cards/v/VoldarenPariah.java +++ b/Mage.Sets/src/mage/cards/v/VoldarenPariah.java @@ -28,7 +28,7 @@ public final class VoldarenPariah extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("three other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public VoldarenPariah(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java b/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java index bb15a7f7222..538c3b2f5df 100644 --- a/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java +++ b/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java @@ -37,7 +37,7 @@ public final class VraskaGolgariQueen extends CardImpl { = new FilterNonlandPermanent("nonland permanent with converted mana cost 3 or less"); static { - filter1.add(new AnotherPredicate()); + filter1.add(AnotherPredicate.instance); filter2.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); } diff --git a/Mage.Sets/src/mage/cards/w/WaterspoutElemental.java b/Mage.Sets/src/mage/cards/w/WaterspoutElemental.java index 9db272b67cb..aac8ad647b9 100644 --- a/Mage.Sets/src/mage/cards/w/WaterspoutElemental.java +++ b/Mage.Sets/src/mage/cards/w/WaterspoutElemental.java @@ -26,7 +26,7 @@ public final class WaterspoutElemental extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creatures"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public WaterspoutElemental(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WaywardServant.java b/Mage.Sets/src/mage/cards/w/WaywardServant.java index a2ab8010508..19a4b2ab1fb 100644 --- a/Mage.Sets/src/mage/cards/w/WaywardServant.java +++ b/Mage.Sets/src/mage/cards/w/WaywardServant.java @@ -26,7 +26,7 @@ public final class WaywardServant extends CardImpl { static { filter.add(new SubtypePredicate(SubType.ZOMBIE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } private static final String rule = "Whenever another Zombie enters the battlefield under your control, each opponent loses 1 life and you gain 1 life."; diff --git a/Mage.Sets/src/mage/cards/w/WeaverOfLies.java b/Mage.Sets/src/mage/cards/w/WeaverOfLies.java index 4dbfaad5ca6..f306ff9c239 100644 --- a/Mage.Sets/src/mage/cards/w/WeaverOfLies.java +++ b/Mage.Sets/src/mage/cards/w/WeaverOfLies.java @@ -34,7 +34,7 @@ public final class WeaverOfLies extends CardImpl { static { filter.add(new AbilityPredicate(MorphAbility.class)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public WeaverOfLies(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WeedPrunerPoplar.java b/Mage.Sets/src/mage/cards/w/WeedPrunerPoplar.java index af4efb00d17..b5a3dd962a4 100644 --- a/Mage.Sets/src/mage/cards/w/WeedPrunerPoplar.java +++ b/Mage.Sets/src/mage/cards/w/WeedPrunerPoplar.java @@ -25,7 +25,7 @@ public final class WeedPrunerPoplar extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature other than {this}"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public WeedPrunerPoplar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java b/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java index 6f11431813d..c584d2d403d 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java @@ -26,7 +26,7 @@ public final class WirewoodHivemaster extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another nontoken Elf"); static { filter.add(new SubtypePredicate(SubType.ELF)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new TokenPredicate())); } public WirewoodHivemaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WispweaverAngel.java b/Mage.Sets/src/mage/cards/w/WispweaverAngel.java index e52cbe13d4a..2de4396f084 100644 --- a/Mage.Sets/src/mage/cards/w/WispweaverAngel.java +++ b/Mage.Sets/src/mage/cards/w/WispweaverAngel.java @@ -36,7 +36,7 @@ public final class WispweaverAngel extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public WispweaverAngel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WizardMentor.java b/Mage.Sets/src/mage/cards/w/WizardMentor.java index e2f67cfd066..580a69dbe64 100644 --- a/Mage.Sets/src/mage/cards/w/WizardMentor.java +++ b/Mage.Sets/src/mage/cards/w/WizardMentor.java @@ -26,7 +26,7 @@ public final class WizardMentor extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public WizardMentor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WookieeRaidleader.java b/Mage.Sets/src/mage/cards/w/WookieeRaidleader.java index cf262a7e39a..4914fa15865 100644 --- a/Mage.Sets/src/mage/cards/w/WookieeRaidleader.java +++ b/Mage.Sets/src/mage/cards/w/WookieeRaidleader.java @@ -25,7 +25,7 @@ public final class WookieeRaidleader extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public WookieeRaidleader(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WorldgorgerDragon.java b/Mage.Sets/src/mage/cards/w/WorldgorgerDragon.java index dffcbeec044..e3f967b7e36 100644 --- a/Mage.Sets/src/mage/cards/w/WorldgorgerDragon.java +++ b/Mage.Sets/src/mage/cards/w/WorldgorgerDragon.java @@ -70,7 +70,7 @@ class WorldgorgerDragonEntersEffect extends OneShotEffect { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public WorldgorgerDragonEntersEffect() { diff --git a/Mage.Sets/src/mage/cards/w/WormfangDrake.java b/Mage.Sets/src/mage/cards/w/WormfangDrake.java index bc3d0ffc5cf..6888edf518b 100644 --- a/Mage.Sets/src/mage/cards/w/WormfangDrake.java +++ b/Mage.Sets/src/mage/cards/w/WormfangDrake.java @@ -65,7 +65,7 @@ class WormfangDrakeExileCost extends CostImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public WormfangDrakeExileCost() { diff --git a/Mage.Sets/src/mage/cards/w/WormfangNewt.java b/Mage.Sets/src/mage/cards/w/WormfangNewt.java index ebb66ead46c..1a27dc96ab4 100644 --- a/Mage.Sets/src/mage/cards/w/WormfangNewt.java +++ b/Mage.Sets/src/mage/cards/w/WormfangNewt.java @@ -25,7 +25,7 @@ public final class WormfangNewt extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public WormfangNewt(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WormfangTurtle.java b/Mage.Sets/src/mage/cards/w/WormfangTurtle.java index b33bec0c8d8..bee8704f5d3 100644 --- a/Mage.Sets/src/mage/cards/w/WormfangTurtle.java +++ b/Mage.Sets/src/mage/cards/w/WormfangTurtle.java @@ -25,7 +25,7 @@ public final class WormfangTurtle extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public WormfangTurtle(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WretchedAnurid.java b/Mage.Sets/src/mage/cards/w/WretchedAnurid.java index 5fe1aa04092..e78c9a68fae 100644 --- a/Mage.Sets/src/mage/cards/w/WretchedAnurid.java +++ b/Mage.Sets/src/mage/cards/w/WretchedAnurid.java @@ -22,7 +22,7 @@ public final class WretchedAnurid extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public WretchedAnurid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/x/XathridDemon.java b/Mage.Sets/src/mage/cards/x/XathridDemon.java index 5d229c1b8a0..0e7c174c463 100644 --- a/Mage.Sets/src/mage/cards/x/XathridDemon.java +++ b/Mage.Sets/src/mage/cards/x/XathridDemon.java @@ -81,7 +81,7 @@ class XathridDemonEffect extends OneShotEffect { } FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature other than " + sourcePermanent.getName()); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); Target target = new TargetControlledCreaturePermanent(1, 1, filter, true); if (target.canChoose(source.getSourceId(), controller.getId(), game)) { diff --git a/Mage.Sets/src/mage/cards/x/XenagosGodOfRevels.java b/Mage.Sets/src/mage/cards/x/XenagosGodOfRevels.java index 76662b8c009..3eada0b3a35 100644 --- a/Mage.Sets/src/mage/cards/x/XenagosGodOfRevels.java +++ b/Mage.Sets/src/mage/cards/x/XenagosGodOfRevels.java @@ -32,7 +32,7 @@ public final class XenagosGodOfRevels extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } public XenagosGodOfRevels(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/y/YodaJediMaster.java b/Mage.Sets/src/mage/cards/y/YodaJediMaster.java index 94bd681f28d..f2da49f6ed9 100644 --- a/Mage.Sets/src/mage/cards/y/YodaJediMaster.java +++ b/Mage.Sets/src/mage/cards/y/YodaJediMaster.java @@ -38,7 +38,7 @@ public final class YodaJediMaster extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another target permanent you own"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new OwnerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java b/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java index a9cbc11f613..7834b9820c6 100644 --- a/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java +++ b/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java @@ -31,7 +31,7 @@ public final class YomijiWhoBarsTheWay extends CardImpl { // Whenever a legendary permanent other than Yomiji, Who Bars the Way is put into a graveyard from the battlefield, return that card to its owner's hand. FilterPermanent filter = new FilterPermanent("a legendary permanent other than " + getName()); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(new SupertypePredicate(SuperType.LEGENDARY)); Effect effect = new ReturnToHandTargetEffect(); effect.setText("return that card to its owner's hand"); diff --git a/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java b/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java index 1fbf2ef563f..b05e459af56 100644 --- a/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java +++ b/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java @@ -30,7 +30,7 @@ public final class ZeganaUtopianSpeaker extends CardImpl { static { filter.add(new CounterPredicate(CounterType.P1P1)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter2.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java index 671945e5f95..987c13eb7f1 100644 --- a/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java @@ -30,7 +30,7 @@ public class DiesCreatureTriggeredAbility extends TriggeredAbilityImpl { public DiesCreatureTriggeredAbility(Effect effect, boolean optional, boolean another, boolean setTargetPointer) { this(effect, optional, new FilterCreaturePermanent(another ? "another creature" : "a creature")); if (another) { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } this.setTargetPointer = setTargetPointer; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java index 1bf91e308d6..2394b15275a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java @@ -41,7 +41,7 @@ public class DevourEffect extends ReplacementEffectImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures to devour"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } private final DevourFactor devourFactor; diff --git a/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java b/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java index 28331ab6929..b073f23f6fe 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java @@ -99,7 +99,7 @@ public class ChampionAbility extends StaticAbility { if (requiresCreature) { filter.add(new CardTypePredicate(CardType.CREATURE)); } - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); // When this permanent enters the battlefield, sacrifice it unless you exile another [object] you control. Ability ability1 = new EntersBattlefieldTriggeredAbility( diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java index da422af6d8f..e2b3cba0b4e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java @@ -112,7 +112,7 @@ class SoulboundEntersSelfEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another not paired creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new PairedPredicate())); } @@ -173,7 +173,7 @@ class SoulbondEntersOtherAbility extends EntersBattlefieldAllTriggeredAbility { static { soulbondFilter.add(Predicates.not(new PairedPredicate())); soulbondFilter.add(new ControllerPredicate(TargetController.YOU)); - soulbondFilter.add(new AnotherPredicate()); + soulbondFilter.add(AnotherPredicate.instance); } public SoulbondEntersOtherAbility() { @@ -214,7 +214,7 @@ class SoulboundEntersOtherEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another not paired creature you control"); static { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.add(Predicates.not(new PairedPredicate())); } diff --git a/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java b/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java index 9e74163a2f7..4b4d591f888 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SupportAbility.java @@ -24,7 +24,7 @@ public class SupportAbility extends EntersBattlefieldTriggeredAbility { if (!card.isInstant() && !card.isSorcery()) { FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures"); if (card.isCreature()) { - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); filter.setMessage("other target creatures"); } addTarget(new TargetCreaturePermanent(0, amount, filter, false)); diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java index 8b05ee0dd09..bb5a1a21548 100644 --- a/Mage/src/main/java/mage/filter/StaticFilters.java +++ b/Mage/src/main/java/mage/filter/StaticFilters.java @@ -297,7 +297,7 @@ public final class StaticFilters { public static final FilterControlledCreaturePermanent FILTER_CONTROLLED_ANOTHER_CREATURE = new FilterControlledCreaturePermanent("another creature"); static { - FILTER_CONTROLLED_ANOTHER_CREATURE.add(new AnotherPredicate()); + FILTER_CONTROLLED_ANOTHER_CREATURE.add(AnotherPredicate.instance); FILTER_CONTROLLED_ANOTHER_CREATURE.setLockedFilter(true); } diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/AnotherPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/AnotherPredicate.java index 19d9bdd2a47..c8d9671388d 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/AnotherPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/AnotherPredicate.java @@ -7,10 +7,10 @@ import mage.game.Game; import mage.game.permanent.Permanent; /** - * * @author North */ -public class AnotherPredicate implements ObjectSourcePlayerPredicate> { +public enum AnotherPredicate implements ObjectSourcePlayerPredicate> { + instance; @Override public boolean apply(ObjectSourcePlayer input, Game game) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java index 81883c03a14..4f1f815b654 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java @@ -72,7 +72,7 @@ class BelzenlokDemonTokenEffect extends OneShotEffect { static { filter.add(new CardTypePredicate(CardType.CREATURE)); - filter.add(new AnotherPredicate()); + filter.add(AnotherPredicate.instance); } BelzenlokDemonTokenEffect() {