github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-10 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

Fix Millicent, Restless Revenant triggered ability. ()

Browse source 
Uses TokenPredicate.FALSE and a FilterControlledPermanent to properly implement the filtering for a nontoken Spirit you control.
This commit is contained in:
Grath 2023-04-23 12:54:24 -04:00 • committed by GitHub
parent 493ac284ca
commit 56cbaab1b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions

11
Mage.Sets/src/mage/cards/m/MillicentRestlessRevenant.java
View file

@ -19,12 +19,12 @@ import mage.constants.SuperType;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.permanent.TokenPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.DamagedEvent; import mage.game.events.DamagedEvent;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent; import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.game.permanent.PermanentToken;
import mage.game.permanent.token.SpiritWhiteToken; import mage.game.permanent.token.SpiritWhiteToken;
import java.util.UUID; import java.util.UUID;
@ -71,6 +71,12 @@ public final class MillicentRestlessRevenant extends CardImpl {
class MillicentRestlessRevenantTriggeredAbility extends TriggeredAbilityImpl { class MillicentRestlessRevenantTriggeredAbility extends TriggeredAbilityImpl {
private static final FilterPermanent filterNontoken = new FilterControlledPermanent(SubType.SPIRIT);
static {
filterNontoken.add(TokenPredicate.FALSE);
}
MillicentRestlessRevenantTriggeredAbility() { MillicentRestlessRevenantTriggeredAbility() {
super(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken())); super(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken()));
} }
@ -114,8 +120,7 @@ class MillicentRestlessRevenantTriggeredAbility extends TriggeredAbilityImpl {
return false; return false;
} }
return permanent.getId().equals(this.getSourceId()) return permanent.getId().equals(this.getSourceId())
|| (!(permanent instanceof PermanentToken) || filterNontoken.match(permanent, getControllerId(), this, game);
&& permanent.hasSubtype(SubType.SPIRIT, game));
} }
@Override @Override