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

Fix: when ending the turn, remove all additional phases/steps scheduled for this turn.

Browse Source
This commit is contained in:
elcnesh
2014-07-11 10:48:54 +00:00
parent 848a9f86f9
commit bf0cc2e926
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -900,7 +900,7 @@ public class PhaseHandler implements java.io.Serializable {
* *
*/ */
public final void addExtraPhase(final PhaseType afterPhase, final PhaseType extraPhase) { public final void addExtraPhase(final PhaseType afterPhase, final PhaseType extraPhase) {
// 300.7. Some effects can add phases to a turn. They do this by adding the phases directly after the specified phase. // 500.8. Some effects can add phases to a turn. They do this by adding the phases directly after the specified phase.
// If multiple extra phases are created after the same phase, the most recently created phase will occur first. // If multiple extra phases are created after the same phase, the most recently created phase will occur first.
if (!this.extraPhases.containsKey(afterPhase)) { if (!this.extraPhases.containsKey(afterPhase)) {
this.extraPhases.put(afterPhase, new Stack<PhaseType>()); this.extraPhases.put(afterPhase, new Stack<PhaseType>());
@@ -1062,6 +1062,7 @@ public class PhaseHandler implements java.io.Serializable {
*/ */
public final void endTurnByEffect() { public final void endTurnByEffect() {
this.combat = null; this.combat = null;
this.extraPhases.clear();
this.phase = PhaseType.CLEANUP; this.phase = PhaseType.CLEANUP;
this.onPhaseBegin(); this.onPhaseBegin();
} }