From 620e1ac0cfe34f23cea743ddbb4fd9b3749ac142 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Sun, 2 Jun 2013 09:37:36 +0000
Subject: [PATCH] - Fixed Cleanup Phase Triggers not firing.

---
 src/main/java/forge/game/phase/PhaseHandler.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java
index 8596ebe39b6..02ab957cf64 100644
--- a/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/src/main/java/forge/game/phase/PhaseHandler.java
@@ -205,8 +205,10 @@ public class PhaseHandler implements java.io.Serializable {
     }
 
     private final void onPhaseBegin() {
+        boolean skipped = false;
         
         if ( isSkippingPhase(phase) ) {
+            skipped = true;
             givePriorityToPlayer = false;
             if( phase == PhaseType.COMBAT_DECLARE_ATTACKERS  )
                 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
         game.getAction().checkStateEffects();
     
-        if (this.givePriorityToPlayer) {
+        if (!skipped) {
             // Run triggers if phase isn't being skipped
             final HashMap<String, Object> runParams = new HashMap<String, Object>();
             runParams.put("Phase", this.getPhase().nameForScripts);