diff --git a/src/magic/model/action/MagicExecuteFirstEventAction.java b/src/magic/model/action/MagicExecuteFirstEventAction.java index 908673d1af..d1f60e62ed 100644 --- a/src/magic/model/action/MagicExecuteFirstEventAction.java +++ b/src/magic/model/action/MagicExecuteFirstEventAction.java @@ -2,6 +2,8 @@ package magic.model.action; import magic.model.MagicGame; import magic.model.event.MagicEvent; +import magic.model.trigger.MagicTriggerType; +import magic.model.choice.MagicTargetChoice; public class MagicExecuteFirstEventAction extends MagicAction { @@ -9,15 +11,19 @@ public class MagicExecuteFirstEventAction extends MagicAction { private MagicEvent firstEvent; public MagicExecuteFirstEventAction(final Object choiceResults[]) { - this.choiceResults=choiceResults; } @Override public void doAction(final MagicGame game) { - firstEvent=game.getEvents().removeFirst(); game.executeEvent(firstEvent,choiceResults); + if (firstEvent.getChoice() instanceof MagicTargetChoice) { + final MagicTargetChoice tchoice = (MagicTargetChoice)firstEvent.getChoice(); + if (tchoice.isTargeted()) { + game.executeTrigger(MagicTriggerType.WhenTargeted, firstEvent.getSource()); + } + } } @Override @@ -25,4 +31,4 @@ public class MagicExecuteFirstEventAction extends MagicAction { game.getEvents().addFirst(firstEvent); } -} \ No newline at end of file +} diff --git a/src/magic/model/trigger/MagicTriggerType.java b/src/magic/model/trigger/MagicTriggerType.java index 6792cd9765..756c6d14f9 100644 --- a/src/magic/model/trigger/MagicTriggerType.java +++ b/src/magic/model/trigger/MagicTriggerType.java @@ -11,6 +11,7 @@ public enum MagicTriggerType { WhenOtherPutIntoGraveyardFromPlay, // permanent WhenAttacks, // permanent WhenBlocks, // permanent + WhenTargeted, // permanent IfDamageWouldBeDealt, // damage ;