mirror of
https://github.com/correl/mage.git
synced 2024-11-15 11:09:30 +00:00
Merge pull request #1708 from drmDev/master
MorkrutNecropod bug fix filter
This commit is contained in:
commit
5320e53f5b
1 changed files with 6 additions and 5 deletions
|
@ -36,7 +36,6 @@ import mage.cards.CardImpl;
|
||||||
import mage.constants.CardType;
|
import mage.constants.CardType;
|
||||||
import mage.constants.Rarity;
|
import mage.constants.Rarity;
|
||||||
import mage.filter.FilterPermanent;
|
import mage.filter.FilterPermanent;
|
||||||
import mage.filter.common.FilterLandPermanent;
|
|
||||||
import mage.filter.predicate.Predicates;
|
import mage.filter.predicate.Predicates;
|
||||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||||
import mage.filter.predicate.permanent.AnotherPredicate;
|
import mage.filter.predicate.permanent.AnotherPredicate;
|
||||||
|
@ -49,9 +48,11 @@ public class MorkrutNecropod extends CardImpl {
|
||||||
|
|
||||||
private static final FilterPermanent filter = new FilterPermanent("another creature or land");
|
private static final FilterPermanent filter = new FilterPermanent("another creature or land");
|
||||||
|
|
||||||
static {
|
static {
|
||||||
filter.add(Predicates.or(Predicates.and(new AnotherPredicate(), new CardTypePredicate(CardType.CREATURE)),
|
filter.add(Predicates.or(
|
||||||
new CardTypePredicate(CardType.LAND)));
|
new CardTypePredicate(CardType.CREATURE),
|
||||||
|
new CardTypePredicate(CardType.LAND)));
|
||||||
|
filter.add(new AnotherPredicate());
|
||||||
}
|
}
|
||||||
|
|
||||||
public MorkrutNecropod(UUID ownerId) {
|
public MorkrutNecropod(UUID ownerId) {
|
||||||
|
@ -66,7 +67,7 @@ public class MorkrutNecropod extends CardImpl {
|
||||||
this.addAbility(new MenaceAbility());
|
this.addAbility(new MenaceAbility());
|
||||||
|
|
||||||
// Whenever Morkrut Necropod attacks or blocks, sacrifice another creature or land.
|
// Whenever Morkrut Necropod attacks or blocks, sacrifice another creature or land.
|
||||||
this.addAbility(new AttacksOrBlocksTriggeredAbility(new SacrificeControllerEffect(new FilterLandPermanent(), 1, ""), false));
|
this.addAbility(new AttacksOrBlocksTriggeredAbility(new SacrificeControllerEffect(filter, 1, ""), false));
|
||||||
}
|
}
|
||||||
|
|
||||||
public MorkrutNecropod(final MorkrutNecropod card) {
|
public MorkrutNecropod(final MorkrutNecropod card) {
|
||||||
|
|
Loading…
Reference in a new issue