Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WhenTargeted corrected triggered for spells with kicker

master
melvin 2011-08-29 17:08:49 +08:00
parent b0d803470e
commit 8a4ee452f9
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/magic/model/event/MagicStackGetChoicesEvent.java
View File

@ -2,6 +2,7 @@ package magic.model.event;
import magic.model.MagicGame;
import magic.model.choice.MagicTargetChoice;
import magic.model.choice.MagicKickerChoice;
import magic.model.stack.MagicItemOnStack;
import magic.model.trigger.MagicTriggerType;
@ -20,11 +21,19 @@ public class MagicStackGetChoicesEvent extends MagicEvent {
event.payManaCost(game,itemOnStack.getController(),choiceResults);
// trigger WhenTargeted
boolean isTargeted = false;
if (event.getChoice() instanceof MagicTargetChoice) {
final MagicTargetChoice tchoice = (MagicTargetChoice)event.getChoice();
if (tchoice.isTargeted()) {
game.executeTrigger(MagicTriggerType.WhenTargeted,itemOnStack);
}
isTargeted = tchoice.isTargeted();
}
if (event.getChoice() instanceof MagicKickerChoice) {
final MagicTargetChoice tchoice = ((MagicKickerChoice)event.getChoice()).getTargetChoice();
isTargeted = tchoice != null && tchoice.isTargeted();
}
if (isTargeted) {
game.executeTrigger(MagicTriggerType.WhenTargeted,itemOnStack);
}
}
};