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

- Fixed Cleanup Phase Triggers not firing.

Browse Source
This commit is contained in:
Sloth
2013-06-02 09:37:36 +00:00
parent 46a249a238
commit 620e1ac0cf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -205,8 +205,10 @@ public class PhaseHandler implements java.io.Serializable {
} }
private final void onPhaseBegin() { private final void onPhaseBegin() {
boolean skipped = false;
if ( isSkippingPhase(phase) ) { if ( isSkippingPhase(phase) ) {
skipped = true;
givePriorityToPlayer = false; givePriorityToPlayer = false;
if( phase == PhaseType.COMBAT_DECLARE_ATTACKERS ) if( phase == PhaseType.COMBAT_DECLARE_ATTACKERS )
playerTurn.removeKeyword("Skip your next combat phase."); playerTurn.removeKeyword("Skip your next combat phase.");
@@ -428,7 +430,7 @@ public class PhaseHandler implements java.io.Serializable {
// Handle effects that happen at the beginning of phases // Handle effects that happen at the beginning of phases
game.getAction().checkStateEffects(); game.getAction().checkStateEffects();
if (this.givePriorityToPlayer) { if (!skipped) {
// Run triggers if phase isn't being skipped // Run triggers if phase isn't being skipped
final HashMap<String, Object> runParams = new HashMap<String, Object>(); final HashMap<String, Object> runParams = new HashMap<String, Object>();
runParams.put("Phase", this.getPhase().nameForScripts); runParams.put("Phase", this.getPhase().nameForScripts);