Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

refactored all usages of CardTypePredicate to match the new implementation

Browse source
This commit is contained in:
Evan Kranzler 2020-01-06 13:18:17 -05:00
parent f685ee3d69
commit 688be783aa
1069 changed files with 1619 additions and 2732 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage/src/main/java/mage/target/common/TargetAnyTargetAmount.java
View file

@ -6,7 +6,6 @@ import mage.constants.CardType;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePlayerOrPlaneswalker;
import mage.filter.common.FilterPermanentOrPlayer;
import mage.filter.predicate.mageobject.CardTypePredicate;
/**
* @author BetaSteward_at_googlemail.com
@ -17,7 +16,7 @@ public class TargetAnyTargetAmount extends TargetPermanentOrPlayerAmount {
= new FilterCreaturePlayerOrPlaneswalker("targets");
static {
defaultFilter.getPermanentFilter().add(new CardTypePredicate(CardType.CREATURE));
defaultFilter.getPermanentFilter().add(CardType.CREATURE.getPredicate());
}
public TargetAnyTargetAmount(int amount) {

3
Mage/src/main/java/mage/target/common/TargetBasicLandCard.java
View file

@ -5,7 +5,6 @@ package mage.target.common;
import mage.constants.CardType;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.TargetCard;
@ -18,7 +17,7 @@ public class TargetBasicLandCard extends TargetCard {
public TargetBasicLandCard(Zone zone) {
super(zone);
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(new CardTypePredicate(CardType.LAND));
filter.add(CardType.LAND.getPredicate());
}
public TargetBasicLandCard(final TargetBasicLandCard target) {

3
Mage/src/main/java/mage/target/common/TargetCreatureOrPlayerAmount.java
View file

@ -5,7 +5,6 @@ import mage.abilities.dynamicvalue.common.StaticValue;
import mage.constants.CardType;
import mage.constants.Zone;
import mage.filter.common.FilterPermanentOrPlayer;
import mage.filter.predicate.mageobject.CardTypePredicate;
/**
* @author BetaSteward_at_googlemail.com
@ -16,7 +15,7 @@ public class TargetCreatureOrPlayerAmount extends TargetPermanentOrPlayerAmount
= new FilterPermanentOrPlayer("creatures and/or players");
static {
defaultFilter.getPermanentFilter().add(new CardTypePredicate(CardType.CREATURE));
defaultFilter.getPermanentFilter().add(CardType.CREATURE.getPredicate());
}
public TargetCreatureOrPlayerAmount(int amount) {