external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/effects/EndTurnEffect.java
View File

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

4
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

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