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

refactored TappedPredicate to use single enum for both conditions

Browse source
This commit is contained in:
Evan Kranzler 2021-05-11 09:33:45 -04:00
parent 59f02ad17a
commit a673ebffc5
282 changed files with 307 additions and 513 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java
View file

@ -73,7 +73,7 @@ public class ConvokeAbility extends SimpleStaticAbility implements AlternateMana
private static final FilterControlledCreaturePermanent filterUntapped = new FilterControlledCreaturePermanent();
static {
filterUntapped.add(Predicates.not(TappedPredicate.instance));
filterUntapped.add(TappedPredicate.UNTAPPED);
}
public ConvokeAbility() {
@ -112,7 +112,7 @@ public class ConvokeAbility extends SimpleStaticAbility implements AlternateMana
// create filter for possible creatures to tap
FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(TappedPredicate.UNTAPPED);
if (unpaid.getMana().getGeneric() == 0) {
List<ColorPredicate> colorPredicates = new ArrayList<>();
if (unpaid.getMana().getBlack() > 0) {