trigger should have executeEvent
parent
006ed566b1
commit
02191a6d6a
|
@ -2,17 +2,22 @@
|
|||
new MagicAtEndOfTurnTrigger() {
|
||||
@Override
|
||||
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer player) {
|
||||
if (permanent.isController(player)) {
|
||||
final Collection<MagicPermanent> targets=
|
||||
game.filterPermanents(permanent.getController(),MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL);
|
||||
for (final MagicPermanent creature : targets) {
|
||||
if (creature.isTapped() &&
|
||||
creature.hasSubType(MagicSubType.Merfolk)) {
|
||||
game.doAction(new MagicUntapAction(creature));
|
||||
}
|
||||
}
|
||||
return permanent.isController(player) ?
|
||||
new MagicEvent(
|
||||
permanent,
|
||||
this,
|
||||
"Untap all Merfolk PN controls."
|
||||
):
|
||||
MagicEvent.NONE;
|
||||
}
|
||||
@Override
|
||||
public void executeEvent(final MagicGame game, final MagicEvent event) {
|
||||
final Collection<MagicPermanent> targets = event.getPlayer().filterPermanents(
|
||||
MagicTargetFilter.TARGET_MERFOLK_YOU_CONTROL
|
||||
);
|
||||
for (final MagicPermanent creature : targets) {
|
||||
game.doAction(new MagicUntapAction(creature));
|
||||
}
|
||||
return MagicEvent.NONE;
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
@ -504,7 +504,7 @@ public interface MagicTargetFilter<T extends MagicTarget> {
|
|||
|
||||
MagicPermanentFilterImpl TARGET_FUNGUS_CREATURE = Factory.creature(MagicSubType.Fungus, Control.Any);
|
||||
|
||||
MagicPermanentFilterImpl TARGET_MERFOLK_YOU_CONTROL = Factory.creature(MagicSubType.Merfolk, Control.You);
|
||||
MagicPermanentFilterImpl TARGET_MERFOLK_YOU_CONTROL = Factory.permanent(MagicSubType.Merfolk, Control.You);
|
||||
|
||||
MagicPermanentFilterImpl TARGET_SAPROLING_YOU_CONTROL = Factory.creature(MagicSubType.Saproling, Control.You);
|
||||
|
||||
|
|
Loading…
Reference in New Issue