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

Merge branch 'durationfix' into 'master'

Browse Source 
Fix UntilEndOfCombat

See merge request core-developers/forge!6452
This commit is contained in:
Hans Mackowiak
2022-03-28 14:18:55 +00:00
parent 4a59794771 e9c2f49a2d
commit 9532b33d86
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/phase/Phase.java
View File

@@ -172,4 +172,4 @@ public class Phase implements java.io.Serializable {
c.remove(0).run();
}
}
} //end class Phase
}

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

@@ -365,7 +365,6 @@ public class PhaseHandler implements java.io.Serializable {
case COMBAT_END:
// End Combat always happens
game.getEndOfCombat().executeUntil();
game.getEndOfCombat().executeAt();
//SDisplayUtil.showTab(EDocID.REPORT_STACK.getDoc());
@@ -423,7 +422,7 @@ public class PhaseHandler implements java.io.Serializable {
c.onCleanupPhase(playerTurn);
}
game.getEndOfCombat().executeUntil(); //Repeat here in case Time Stop et. al. ends combat early
endCombat(); //Repeat here in case Time Stop et. al. ends combat early
game.getEndOfTurn().executeUntil();
game.getEndOfTurn().executeUntilEndOfPhase(playerTurn);
game.getEndOfTurn().registerUntilEndCommand(playerTurn);
@@ -1225,8 +1224,6 @@ public class PhaseHandler implements java.io.Serializable {
endCombat();
game.getAction().checkStateEffects(true);
setPhase(PhaseType.COMBAT_END);
// End Combat always happens
game.getEndOfCombat().executeUntil();
advanceToNextPhase();
}
@@ -1262,6 +1259,7 @@ public class PhaseHandler implements java.io.Serializable {
}
public void endCombat() {
game.getEndOfCombat().executeUntil();
if (combat != null) {
combat.endCombat();
combat = null;