diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java index 7935854a1ba..5fd75a8e53a 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java @@ -253,7 +253,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene predicates.add(new ColorPredicate(ObjectColor.WHITE)); } if (this.tbColorless.isSelected()) { - predicates.add(new ColorlessPredicate()); + predicates.add(ColorlessPredicate.instance); } filter.add(Predicates.or(predicates)); diff --git a/Mage.Sets/src/mage/cards/a/AncientStirrings.java b/Mage.Sets/src/mage/cards/a/AncientStirrings.java index e9408b81cd0..490c2641f54 100644 --- a/Mage.Sets/src/mage/cards/a/AncientStirrings.java +++ b/Mage.Sets/src/mage/cards/a/AncientStirrings.java @@ -20,7 +20,7 @@ public final class AncientStirrings extends CardImpl { private static final FilterCard filter = new FilterCard("a colorless card"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java index 70ed9030db0..350f221c345 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java +++ b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java @@ -32,7 +32,7 @@ public final class BarrageTyrant extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public BarrageTyrant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CeremoniousRejection.java b/Mage.Sets/src/mage/cards/c/CeremoniousRejection.java index c3aed499b7e..e8ef317b006 100644 --- a/Mage.Sets/src/mage/cards/c/CeremoniousRejection.java +++ b/Mage.Sets/src/mage/cards/c/CeremoniousRejection.java @@ -19,7 +19,7 @@ public final class CeremoniousRejection extends CardImpl { private static final FilterSpell filter = new FilterSpell("colorless spell"); static{ - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public CeremoniousRejection(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java b/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java index 137a3b091df..c3bb6e17822 100644 --- a/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java +++ b/Mage.Sets/src/mage/cards/c/ConduitOfRuin.java @@ -38,7 +38,7 @@ public final class ConduitOfRuin extends CardImpl { private static final FilterCreatureCard filterCost = new FilterCreatureCard("The first creature spell"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 6)); filterCost.add(new FirstCastCreatureSpellPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/DominatorDrone.java b/Mage.Sets/src/mage/cards/d/DominatorDrone.java index 5cd9f278b7b..ece62e0d2a4 100644 --- a/Mage.Sets/src/mage/cards/d/DominatorDrone.java +++ b/Mage.Sets/src/mage/cards/d/DominatorDrone.java @@ -29,7 +29,7 @@ public final class DominatorDrone extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public DominatorDrone(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DustStalker.java b/Mage.Sets/src/mage/cards/d/DustStalker.java index 3e879c2d975..4a156722407 100644 --- a/Mage.Sets/src/mage/cards/d/DustStalker.java +++ b/Mage.Sets/src/mage/cards/d/DustStalker.java @@ -29,7 +29,7 @@ public final class DustStalker extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public DustStalker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java index ca9423ccaee..6538c6ac1de 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java +++ b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java @@ -30,7 +30,7 @@ public final class EldraziAggressor extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public EldraziAggressor(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 b2e7322440f..657a7a8565c 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziMimic.java +++ b/Mage.Sets/src/mage/cards/e/EldraziMimic.java @@ -29,7 +29,7 @@ public final class EldraziMimic extends CardImpl { static { FILTER.add(AnotherPredicate.instance); - FILTER.add(new ColorlessPredicate()); + FILTER.add(ColorlessPredicate.instance); } public EldraziMimic(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java b/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java index 9d4c6f1fdb4..b08775abcbc 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java @@ -28,7 +28,7 @@ public final class EmrakulTheAeonsTorn extends CardImpl { private static final FilterSpell filter = new FilterSpell("colored spells"); static { - filter.add(Predicates.not(new ColorlessPredicate())); + filter.add(Predicates.not(ColorlessPredicate.instance)); } public EmrakulTheAeonsTorn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java index 67223f4db30..0fef45898fe 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java @@ -31,8 +31,8 @@ public final class EyeOfUgin extends CardImpl { private static final FilterCard filterSpells = new FilterCard("Colorless Eldrazi spells"); static { - filter.add(new ColorlessPredicate()); - filterSpells.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); + filterSpells.add(ColorlessPredicate.instance); filterSpells.add(new SubtypePredicate(SubType.ELDRAZI)); } diff --git a/Mage.Sets/src/mage/cards/f/FlayerDrone.java b/Mage.Sets/src/mage/cards/f/FlayerDrone.java index 3606868f174..548e19f0181 100644 --- a/Mage.Sets/src/mage/cards/f/FlayerDrone.java +++ b/Mage.Sets/src/mage/cards/f/FlayerDrone.java @@ -28,7 +28,7 @@ public final class FlayerDrone extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public FlayerDrone(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java index 710d7d12970..75685ca33fc 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java @@ -28,7 +28,7 @@ public final class ForerunnerOfSlaughter extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("colorless creature"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public ForerunnerOfSlaughter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinCratermaker.java b/Mage.Sets/src/mage/cards/g/GoblinCratermaker.java index ae1334c38e1..9b54aac730e 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCratermaker.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCratermaker.java @@ -29,7 +29,7 @@ public final class GoblinCratermaker extends CardImpl { = new FilterNonlandPermanent("colorless nonland permanent"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public GoblinCratermaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GrizzledAngler.java b/Mage.Sets/src/mage/cards/g/GrizzledAngler.java index 543b5807b10..b1715bac1f4 100644 --- a/Mage.Sets/src/mage/cards/g/GrizzledAngler.java +++ b/Mage.Sets/src/mage/cards/g/GrizzledAngler.java @@ -55,7 +55,7 @@ class GrizzledAnglerEffect extends OneShotEffect { private static final FilterCreatureCard filter = new FilterCreatureCard("a colorless creature card in your graveyard"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public GrizzledAnglerEffect() { diff --git a/Mage.Sets/src/mage/cards/g/GruesomeSlaughter.java b/Mage.Sets/src/mage/cards/g/GruesomeSlaughter.java index 9e7c23ffeea..944d82dd9d5 100644 --- a/Mage.Sets/src/mage/cards/g/GruesomeSlaughter.java +++ b/Mage.Sets/src/mage/cards/g/GruesomeSlaughter.java @@ -27,7 +27,7 @@ public final class GruesomeSlaughter extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("colorless creatures you control"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public GruesomeSlaughter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfKozilek.java b/Mage.Sets/src/mage/cards/h/HeraldOfKozilek.java index c83c25f0aa3..eb589cc5f70 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfKozilek.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfKozilek.java @@ -23,7 +23,7 @@ public final class HeraldOfKozilek extends CardImpl { private static final FilterCard filter = new FilterCard("Colorless spells"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public HeraldOfKozilek(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InfernalReckoning.java b/Mage.Sets/src/mage/cards/i/InfernalReckoning.java index 6c2a2146024..1d1cc6ded2e 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalReckoning.java +++ b/Mage.Sets/src/mage/cards/i/InfernalReckoning.java @@ -23,7 +23,7 @@ public final class InfernalReckoning extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("colorless creature"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public InfernalReckoning(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KozileksSentinel.java b/Mage.Sets/src/mage/cards/k/KozileksSentinel.java index 4cbaef9e8f5..9399ec74d29 100644 --- a/Mage.Sets/src/mage/cards/k/KozileksSentinel.java +++ b/Mage.Sets/src/mage/cards/k/KozileksSentinel.java @@ -23,7 +23,7 @@ public final class KozileksSentinel extends CardImpl { private static final FilterSpell filterSpell = new FilterSpell("a colorless spell"); static { - filterSpell.add(new ColorlessPredicate()); + filterSpell.add(ColorlessPredicate.instance); } public KozileksSentinel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MoltenNursery.java b/Mage.Sets/src/mage/cards/m/MoltenNursery.java index dcc0dace269..e0280c34cda 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenNursery.java +++ b/Mage.Sets/src/mage/cards/m/MoltenNursery.java @@ -22,7 +22,7 @@ public final class MoltenNursery extends CardImpl { private static final FilterSpell filter = new FilterSpell("a colorless spell"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public MoltenNursery(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NettleDrone.java b/Mage.Sets/src/mage/cards/n/NettleDrone.java index da8ddeef7c8..e565226ee20 100644 --- a/Mage.Sets/src/mage/cards/n/NettleDrone.java +++ b/Mage.Sets/src/mage/cards/n/NettleDrone.java @@ -27,7 +27,7 @@ public final class NettleDrone extends CardImpl { private static final FilterSpell filterSpell = new FilterSpell("a colorless spell"); static { - filterSpell.add(new ColorlessPredicate()); + filterSpell.add(ColorlessPredicate.instance); } public NettleDrone(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/ReachOfShadows.java b/Mage.Sets/src/mage/cards/r/ReachOfShadows.java index 60c5d7b24a8..0f697be957e 100644 --- a/Mage.Sets/src/mage/cards/r/ReachOfShadows.java +++ b/Mage.Sets/src/mage/cards/r/ReachOfShadows.java @@ -20,7 +20,7 @@ public final class ReachOfShadows extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that's one or more colors"); static { - filter.add(Predicates.not(new ColorlessPredicate())); + filter.add(Predicates.not(ColorlessPredicate.instance)); } public ReachOfShadows(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/ReaverDrone.java b/Mage.Sets/src/mage/cards/r/ReaverDrone.java index 2ed17709da2..441d903afff 100644 --- a/Mage.Sets/src/mage/cards/r/ReaverDrone.java +++ b/Mage.Sets/src/mage/cards/r/ReaverDrone.java @@ -29,7 +29,7 @@ public final class ReaverDrone extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public ReaverDrone(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RuinationGuide.java b/Mage.Sets/src/mage/cards/r/RuinationGuide.java index b008a9d3621..c552cb5bca7 100644 --- a/Mage.Sets/src/mage/cards/r/RuinationGuide.java +++ b/Mage.Sets/src/mage/cards/r/RuinationGuide.java @@ -25,7 +25,7 @@ public final class RuinationGuide extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("colorless creatures"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public RuinationGuide(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java b/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java index f9754711db5..b43ee672514 100644 --- a/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java +++ b/Mage.Sets/src/mage/cards/r/RuinsOfOranRief.java @@ -27,7 +27,7 @@ public final class RuinsOfOranRief extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("colorless creature that entered the battlefield this turn"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); filter.add(new EnteredThisTurnPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/SanctumOfUgin.java b/Mage.Sets/src/mage/cards/s/SanctumOfUgin.java index bc747932c77..68c6258fc6e 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumOfUgin.java +++ b/Mage.Sets/src/mage/cards/s/SanctumOfUgin.java @@ -27,8 +27,8 @@ public final class SanctumOfUgin extends CardImpl { private static final FilterSpell filterSpells = new FilterSpell("colorless spell with converted mana cost 7 or greater"); static { - filter.add(new ColorlessPredicate()); - filterSpells.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); + filterSpells.add(ColorlessPredicate.instance); filterSpells.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 6)); } diff --git a/Mage.Sets/src/mage/cards/s/ShrineOfTheForsakenGods.java b/Mage.Sets/src/mage/cards/s/ShrineOfTheForsakenGods.java index 992ffd901ce..0dac6ffc82b 100644 --- a/Mage.Sets/src/mage/cards/s/ShrineOfTheForsakenGods.java +++ b/Mage.Sets/src/mage/cards/s/ShrineOfTheForsakenGods.java @@ -25,7 +25,7 @@ public final class ShrineOfTheForsakenGods extends CardImpl { private static final FilterSpell filter = new FilterSpell("colorless spells"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public ShrineOfTheForsakenGods(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/Skitterskin.java b/Mage.Sets/src/mage/cards/s/Skitterskin.java index 8659145a304..0ce710eb673 100644 --- a/Mage.Sets/src/mage/cards/s/Skitterskin.java +++ b/Mage.Sets/src/mage/cards/s/Skitterskin.java @@ -29,7 +29,7 @@ public final class Skitterskin extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public Skitterskin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkyScourer.java b/Mage.Sets/src/mage/cards/s/SkyScourer.java index 0350d7c4731..c5f8142e32e 100644 --- a/Mage.Sets/src/mage/cards/s/SkyScourer.java +++ b/Mage.Sets/src/mage/cards/s/SkyScourer.java @@ -24,7 +24,7 @@ public final class SkyScourer extends CardImpl { private static final FilterSpell filterSpell = new FilterSpell("a colorless spell"); static { - filterSpell.add(new ColorlessPredicate()); + filterSpell.add(ColorlessPredicate.instance); } public SkyScourer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SwarmSurge.java b/Mage.Sets/src/mage/cards/s/SwarmSurge.java index 2bf4f0104e5..74c0ca260d0 100644 --- a/Mage.Sets/src/mage/cards/s/SwarmSurge.java +++ b/Mage.Sets/src/mage/cards/s/SwarmSurge.java @@ -23,7 +23,7 @@ public final class SwarmSurge extends CardImpl { private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("Colorless creatures you control"); static { - FILTER.add(new ColorlessPredicate()); + FILTER.add(ColorlessPredicate.instance); } public SwarmSurge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThoughtHarvester.java b/Mage.Sets/src/mage/cards/t/ThoughtHarvester.java index 051a00cc434..1b3cf72dc37 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtHarvester.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtHarvester.java @@ -25,7 +25,7 @@ public final class ThoughtHarvester extends CardImpl { private static final FilterSpell filter = new FilterSpell("a colorless spell"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public ThoughtHarvester(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TideDrifter.java b/Mage.Sets/src/mage/cards/t/TideDrifter.java index 143baaff6da..e27e0d84c56 100644 --- a/Mage.Sets/src/mage/cards/t/TideDrifter.java +++ b/Mage.Sets/src/mage/cards/t/TideDrifter.java @@ -24,7 +24,7 @@ public final class TideDrifter extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("colorless creatures"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public TideDrifter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TitansPresence.java b/Mage.Sets/src/mage/cards/t/TitansPresence.java index 797104f9f00..fc2c7c08dce 100644 --- a/Mage.Sets/src/mage/cards/t/TitansPresence.java +++ b/Mage.Sets/src/mage/cards/t/TitansPresence.java @@ -29,7 +29,7 @@ public final class TitansPresence extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("a colorless creature card from your hand"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public TitansPresence(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java b/Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java index 6f4cebe7c37..5a7d4490158 100644 --- a/Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java +++ b/Mage.Sets/src/mage/cards/t/TombOfTheSpiritDragon.java @@ -25,7 +25,7 @@ public final class TombOfTheSpiritDragon extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("colorless creature you control"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public TombOfTheSpiritDragon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java b/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java index d508d489b39..880666f4e9e 100644 --- a/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java +++ b/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java @@ -100,7 +100,7 @@ class UginTheSpiritDragonEffect2 extends OneShotEffect { FilterPermanent filter = new FilterPermanent("permanent with converted mana cost X or less that's one or more colors"); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, cmc + 1)); - filter.add(Predicates.not(new ColorlessPredicate())); + filter.add(Predicates.not(ColorlessPredicate.instance)); Set permanentsToExile = new HashSet<>(); permanentsToExile.addAll(game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)); controller.moveCards(permanentsToExile, Zone.EXILED, source, game); diff --git a/Mage.Sets/src/mage/cards/u/UginsConstruct.java b/Mage.Sets/src/mage/cards/u/UginsConstruct.java index f0b36c2eafa..39e1b789dce 100644 --- a/Mage.Sets/src/mage/cards/u/UginsConstruct.java +++ b/Mage.Sets/src/mage/cards/u/UginsConstruct.java @@ -22,7 +22,7 @@ public final class UginsConstruct extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("permanent that's one or more colors"); static { - filter.add(Predicates.not(new ColorlessPredicate())); + filter.add(Predicates.not(ColorlessPredicate.instance)); } public UginsConstruct(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VileAggregate.java b/Mage.Sets/src/mage/cards/v/VileAggregate.java index bd4cbb2e7b8..e9bfb82417e 100644 --- a/Mage.Sets/src/mage/cards/v/VileAggregate.java +++ b/Mage.Sets/src/mage/cards/v/VileAggregate.java @@ -28,7 +28,7 @@ public final class VileAggregate extends CardImpl { private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("colorless creatures you control"); static { - filter.add(new ColorlessPredicate()); + filter.add(ColorlessPredicate.instance); } public VileAggregate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/ColorlessPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/ColorlessPredicate.java index 3dcf34b34d8..0eee39d8823 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/ColorlessPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/ColorlessPredicate.java @@ -6,10 +6,10 @@ import mage.filter.predicate.Predicate; import mage.game.Game; /** - * * @author North */ -public class ColorlessPredicate implements Predicate { +public enum ColorlessPredicate implements Predicate { + instance; @Override public boolean apply(MageObject input, Game game) {