use EnqueueTriggerAction instead of PutItemOnStackAction for state trigger so they go onto the stack when a player has priority
parent
49d33a7a3d
commit
3e797def5b
|
@ -991,6 +991,10 @@ public class MagicGame {
|
|||
return pendingStack;
|
||||
}
|
||||
|
||||
public boolean hasItem(final MagicSource source, final String desc) {
|
||||
return stack.hasItem(source, desc) || pendingStack.hasItem(source, desc);
|
||||
}
|
||||
|
||||
public void setPriorityPassed(final boolean passed) {
|
||||
priorityPassed=passed;
|
||||
}
|
||||
|
|
|
@ -14,8 +14,8 @@ public class PutStateTriggerOnStackAction extends MagicAction {
|
|||
|
||||
@Override
|
||||
public void doAction(final MagicGame game) {
|
||||
if (game.getStack().hasItem(event.getSource(), event.getChoiceDescription()) == false) {
|
||||
game.doAction(new PutItemOnStackAction(new MagicTriggerOnStack(event)));
|
||||
if (game.hasItem(event.getSource(), event.getChoiceDescription()) == false) {
|
||||
game.doAction(new EnqueueTriggerAction(event));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue