github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Oleg Agafonov 2019-01-13 01:39:30 +04:00
commit 2ece7a9bb2
1004 changed files with 1125 additions and 1128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
View file

@ -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));

2
Mage.Sets/src/mage/cards/a/AbzanAscendancy.java
View file

@ -28,7 +28,7 @@ public final class AbzanAscendancy extends CardImpl {
static {
filter.add(new ControllerPredicate(TargetController.YOU));
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
}
public AbzanAscendancy(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java
View file

@ -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));
}

2
Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AdmonitionAngel.java
View file

@ -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)));
}

2
Mage.Sets/src/mage/cards/a/AegisAngel.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AegisAutomaton.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AerialGuide.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AetherbornMarauder.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AethersquallAncient.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AjaniSteadfast.java
View file

@ -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));
}

2
Mage.Sets/src/mage/cards/a/AjaniUnyielding.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java
View file

@ -30,7 +30,7 @@ public final class AkoumFlameseeker extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.ALLY));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public AkoumFlameseeker(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AkroanConscriptor.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AkroanHoplite.java
View file

@ -27,7 +27,7 @@ public final class AkroanHoplite extends CardImpl {
static {
filter.add(new ControllerPredicate(TargetController.YOU));
filter.add(new AttackingPredicate());
filter.add(AttackingPredicate.instance);
}
public AkroanHoplite(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/Alarum.java
View file

@ -23,7 +23,7 @@ public final class Alarum extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonattacking creature");
static {
filter.add(Predicates.not(new AttackingPredicate()));
filter.add(Predicates.not(AttackingPredicate.instance));
}
public Alarum(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AltarGolem.java
View file

@ -34,7 +34,7 @@ public final class AltarGolem extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public AltarGolem(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AlwaysWatching.java
View file

@ -26,7 +26,7 @@ public final class AlwaysWatching extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creatures");
static {
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
}
public AlwaysWatching(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AmbushKrotiq.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AnaBattlemage.java
View file

@ -34,7 +34,7 @@ public final class AnaBattlemage extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public AnaBattlemage(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AnabaAncestor.java
View file

@ -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) {

4
Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java
View file

@ -25,8 +25,8 @@ public final class AnafenzaKinTreeSpirit extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another nontoken creature");
static {
filter.add(Predicates.not(new TokenPredicate()));
filter.add(new AnotherPredicate());
filter.add(Predicates.not(TokenPredicate.instance));
filter.add(AnotherPredicate.instance);
}
public AnafenzaKinTreeSpirit(UUID ownerId, CardSetInfo setInfo) {

4
Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java
View file

@ -32,8 +32,8 @@ 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(new TappedPredicate());
filter.add(AnotherPredicate.instance);
filter.add(TappedPredicate.instance);
}
public AnafenzaTheForemost(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AncestorsProphet.java
View file

@ -27,7 +27,7 @@ public final class AncestorsProphet extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.CLERIC));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public AncestorsProphet(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AncestralMask.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AncientHellkite.java
View file

@ -29,7 +29,7 @@ public final class AncientHellkite extends CardImpl {
static {
filter.add(new CardTypePredicate(CardType.CREATURE));
filter.add(new DefendingPlayerControlsPredicate());
filter.add(DefendingPlayerControlsPredicate.instance);
}
public AncientHellkite(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AncientHolocron.java
View file

@ -23,7 +23,7 @@ public final class AncientHolocron extends CardImpl {
private static final FilterSpell filter = new FilterSpell("multicolored spells");
static {
filter.add(new MulticoloredPredicate());
filter.add(MulticoloredPredicate.instance);
}
public AncientHolocron(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AncientStirrings.java
View file

@ -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);
}

2
Mage.Sets/src/mage/cards/a/AncientStoneIdol.java
View file

@ -65,7 +65,7 @@ class AncientStoneIdolCostReductionEffect extends CostModificationEffectImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
static {
filter.add(new AttackingPredicate());
filter.add(AttackingPredicate.instance);
}
public AncientStoneIdolCostReductionEffect() {

2
Mage.Sets/src/mage/cards/a/AngelOfCondemnation.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AngelicCaptain.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AngelicFavor.java
View file

@ -38,7 +38,7 @@ public final class AngelicFavor extends CardImpl {
private static final FilterControlledCreaturePermanent untappedCreatureYouControl = new FilterControlledCreaturePermanent("untapped creature you control");
static {
untappedCreatureYouControl.add(Predicates.not(new TappedPredicate()));
untappedCreatureYouControl.add(Predicates.not(TappedPredicate.instance));
}
public AngelicFavor(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AnointerPriest.java
View file

@ -24,7 +24,7 @@ public final class AnointerPriest extends CardImpl {
private static final FilterPermanent filter = new FilterCreaturePermanent("a creature token");
static {
filter.add(new TokenPredicate());
filter.add(TokenPredicate.instance);
}
public AnointerPriest(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AphettoGrifter.java
View file

@ -28,7 +28,7 @@ public final class AphettoGrifter extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Wizards you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.WIZARD));
}

2
Mage.Sets/src/mage/cards/a/ApocalypseChime.java
View file

@ -27,7 +27,7 @@ public final class ApocalypseChime extends CardImpl {
static {
filter.add(Predicates.and(
Predicates.not(new TokenPredicate()),
Predicates.not(TokenPredicate.instance),
new ExpansionSetPredicate("HML")
));
}

2
Mage.Sets/src/mage/cards/a/ApocalypseDemon.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/ApothecaryGeist.java
View file

@ -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));
}

2
Mage.Sets/src/mage/cards/a/ArachnusSpinner.java
View file

@ -39,7 +39,7 @@ public final class ArachnusSpinner extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.SPIDER));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public ArachnusSpinner(UUID ownerId, CardSetInfo setInfo) {

4
Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/ArashinForemost.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/ArashinWarBeast.java
View file

@ -51,7 +51,7 @@ class ArashinWarBeastTriggeredAbility extends TriggeredAbilityImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("one or more blockers");
static {
filter.add(new BlockingPredicate());
filter.add(BlockingPredicate.instance);
}
boolean usedForCombatDamageStep;

4
Mage.Sets/src/mage/cards/a/ArcadesSabboth.java
View file

@ -29,8 +29,8 @@ public final class ArcadesSabboth extends CardImpl {
static {
filter.add(new ControllerPredicate(TargetController.YOU));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(new AttackingPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(Predicates.not(AttackingPredicate.instance));
}
public ArcadesSabboth(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/ArcboundCrusher.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/ArtificersAssistant.java
View file

@ -22,7 +22,7 @@ public final class ArtificersAssistant extends CardImpl {
private static final FilterSpell filter = new FilterSpell("a historic spell");
static {
filter.add(new HistoricPredicate());
filter.add(HistoricPredicate.instance);
}
public ArtificersAssistant(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java
View file

@ -80,7 +80,7 @@ class AryelTapXTargetCost extends VariableCostImpl {
static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Knights you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.KNIGHT));
}

2
Mage.Sets/src/mage/cards/a/AshenmoorCohort.java
View file

@ -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";

2
Mage.Sets/src/mage/cards/a/Asphyxiate.java
View file

@ -20,7 +20,7 @@ public final class Asphyxiate extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public Asphyxiate(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/Assassinate.java
View file

@ -20,7 +20,7 @@ public final class Assassinate extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
static {
filter.add(new TappedPredicate());
filter.add(TappedPredicate.instance);
}
public Assassinate(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AssassinsBlade.java
View file

@ -29,7 +29,7 @@ public final class AssassinsBlade extends CardImpl {
static {
filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK)));
filter.add(new AttackingPredicate());
filter.add(AttackingPredicate.instance);
}
public AssassinsBlade(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java
View file

@ -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));
}

2
Mage.Sets/src/mage/cards/a/AtzocanArcher.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AuraGraft.java
View file

@ -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);

2
Mage.Sets/src/mage/cards/a/AuraOfDominion.java
View file

@ -31,7 +31,7 @@ public final class AuraOfDominion extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}

2
Mage.Sets/src/mage/cards/a/AuriokChampion.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/Aurochs.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AurochsHerd.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AuroraChampion.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AvacynThePurifier.java
View file

@ -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<Permanent> permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game);
for (Permanent permanent : permanents) {
permanent.damage(3, source.getSourceId(), game, false, true);

2
Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AvenSoulgazer.java
View file

@ -33,7 +33,7 @@ public final class AvenSoulgazer extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("face down creature");
static {
filter.add(new FaceDownPredicate());
filter.add(FaceDownPredicate.instance);
}
public AvenSoulgazer(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AviaryMechanic.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/a/AweForTheGuilds.java
View file

@ -22,7 +22,7 @@ public final class AweForTheGuilds extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Monocolored creatures");
static {
filter.add(Predicates.not(new MulticoloredPredicate()));
filter.add(Predicates.not(MulticoloredPredicate.instance));
}
public AweForTheGuilds(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java
View file

@ -27,7 +27,7 @@ public final class AzamiLadyOfScrolls extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Wizard you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.WIZARD));
}

2
Mage.Sets/src/mage/cards/b/Backlash.java
View file

@ -24,7 +24,7 @@ public final class Backlash extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public Backlash(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java
View file

@ -34,7 +34,7 @@ public final class BalduvianTradingPost extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.MOUNTAIN));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public BalduvianTradingPost(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/BallynockCohort.java
View file

@ -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";

2
Mage.Sets/src/mage/cards/b/BalthorTheStout.java
View file

@ -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));
}

4
Mage.Sets/src/mage/cards/b/BantSureblade.java
View file

@ -29,8 +29,8 @@ public final class BantSureblade extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("another multicolor permanent");
static {
filter.add(new MulticoloredPredicate());
filter.add(new AnotherPredicate());
filter.add(MulticoloredPredicate.instance);
filter.add(AnotherPredicate.instance);
}
public BantSureblade(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/BaronSengir.java
View file

@ -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) {

4
Mage.Sets/src/mage/cards/b/BarrageTyrant.java
View file

@ -31,8 +31,8 @@ public final class BarrageTyrant extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another colorless creature");
static {
filter.add(new AnotherPredicate());
filter.add(new ColorlessPredicate());
filter.add(AnotherPredicate.instance);
filter.add(ColorlessPredicate.instance);
}
public BarrageTyrant(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/BarrenGlory.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/b/BastionProtector.java
View file

@ -27,7 +27,7 @@ public final class BastionProtector extends CardImpl {
private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Commander creatures");
static {
filter.add(new CommanderPredicate());
filter.add(CommanderPredicate.instance);
}
public BastionProtector(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/BattleScreech.java
View file

@ -27,7 +27,7 @@ public final class BattleScreech extends CardImpl {
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public BattleScreech(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/BazaarKrovod.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/b/BazaarOfWonders.java
View file

@ -76,7 +76,7 @@ class BazaarOfWondersEffect extends OneShotEffect {
String spellName = spell.getName();
FilterPermanent filter1 = new FilterPermanent();
filter1.add(new NamePredicate(spellName));
filter1.add(Predicates.not(new TokenPredicate()));
filter1.add(Predicates.not(TokenPredicate.instance));
if (!game.getBattlefield().getActivePermanents(filter1, source.getControllerId(), game).isEmpty()) {
spell.counter(source.getControllerId(), game);
return true;

2
Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java
View file

@ -29,7 +29,7 @@ public final class BeastmastersMagemark extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control that are enchanted");
static {
filter.add(new EnchantedPredicate());
filter.add(EnchantedPredicate.instance);
filter.add(new ControllerPredicate(TargetController.YOU));
}

2
Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java
View file

@ -30,7 +30,7 @@ public final class BeastsOfBogardan extends CardImpl {
static {
controlFilter.add(new ColorPredicate(ObjectColor.WHITE));
controlFilter.add(Predicates.not(new TokenPredicate()));
controlFilter.add(Predicates.not(TokenPredicate.instance));
}
public BeastsOfBogardan(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/BellowingAegisaur.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/b/BelltollDragon.java
View file

@ -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));
}

2
Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java
View file

@ -30,7 +30,7 @@ public final class BenBenAkkiHermit extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("untapped Mountain you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.MOUNTAIN));
}

2
Mage.Sets/src/mage/cards/b/BenalishMissionary.java
View file

@ -27,7 +27,7 @@ public final class BenalishMissionary extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("blocked creature");
static {
filter.add(new BlockedPredicate());
filter.add(BlockedPredicate.instance);
}
public BenalishMissionary(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/Benthicore.java
View file

@ -33,7 +33,7 @@ public final class Benthicore extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.MERFOLK));
}

2
Mage.Sets/src/mage/cards/b/BetrothedOfFire.java
View file

@ -32,7 +32,7 @@ public final class BetrothedOfFire extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledCreaturePermanent("an untapped creature");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public BetrothedOfFire(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/Bifurcate.java
View file

@ -29,7 +29,7 @@ public final class Bifurcate extends CardImpl {
private static FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creatures");
static {
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
}
public Bifurcate(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/BindingMummy.java
View file

@ -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));
}

2
Mage.Sets/src/mage/cards/b/BirchloreRangers.java
View file

@ -26,7 +26,7 @@ public final class BirchloreRangers extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Elves you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.ELF));
}

4
Mage.Sets/src/mage/cards/b/BlackOakOfOdunos.java
View file

@ -30,8 +30,8 @@ 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(Predicates.not(new TappedPredicate()));
filter.add(AnotherPredicate.instance);
filter.add(Predicates.not(TappedPredicate.instance));
}
public BlackOakOfOdunos(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/BlaringCaptain.java
View file

@ -23,7 +23,7 @@ public final class BlaringCaptain extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.WARRIOR, "attacking Warriors");
static {
filter.add(new AttackingPredicate());
filter.add(AttackingPredicate.instance);
}
public BlaringCaptain(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/BlindSpotGiant.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/b/Blockbuster.java
View file

@ -23,7 +23,7 @@ public final class Blockbuster extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
static {
filter.add(new TappedPredicate());
filter.add(TappedPredicate.instance);
}
public Blockbuster(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/BloodChinFanatic.java
View file

@ -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));
}

2
Mage.Sets/src/mage/cards/b/BloodTribute.java
View file

@ -37,7 +37,7 @@ public final class BloodTribute extends CardImpl {
TextPartSubType textPartVampire = (TextPartSubType) addTextPart(new TextPartSubType(SubType.VAMPIRE));
FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an untapped Vampire you control");
filter.add(new TextPartSubtypePredicate(textPartVampire));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
this.addAbility(new KickerAbility(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))));
// Target opponent loses half their life, rounded up.

2
Mage.Sets/src/mage/cards/b/Bloodbriar.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/b/BloodmistInfiltrator.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/b/BloodswornSteward.java
View file

@ -27,7 +27,7 @@ public final class BloodswornSteward extends CardImpl {
private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Commander creatures");
static {
filter.add(new CommanderPredicate());
filter.add(CommanderPredicate.instance);
}
public BloodswornSteward(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/BoardTheWeatherlight.java
View file

@ -19,7 +19,7 @@ public final class BoardTheWeatherlight extends CardImpl {
private static final FilterCard filter = new FilterCard("a historic card");
static {
filter.add(new HistoricPredicate());
filter.add(HistoricPredicate.instance);
}
public BoardTheWeatherlight(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/BoltwingMarauder.java
View file

@ -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) {

Some files were not shown because too many files have changed in this diff Show more