- FIx End Turn effect not clearing waiting triggers from the stack.

This commit is contained in:
Sol
2015-07-26 00:45:24 +00:00
parent 425acea5b0
commit f1e3fe22b8
2 changed files with 6 additions and 0 deletions

View File

@@ -26,6 +26,8 @@ public class EndTurnEffect extends SpellAbilityEffect {
game.getAction().exile(c);
}
game.getStack().clear();
game.getStack().clearSimultaneousStack();
game.getTriggerHandler().clearWaitingTriggers();
// 2) All attacking and blocking creatures are removed from combat.
game.getPhaseHandler().endCombat();

View File

@@ -324,6 +324,10 @@ public class TriggerHandler {
return checkStatics;
}
public void clearWaitingTriggers() {
waitingTriggers.clear();
}
private boolean runNonStaticTriggersForPlayer(final Player player, final TriggerType mode,
final Map<String, Object> runParams, final List<Trigger> delayedTriggersWorkingCopy ) {