From e2fb5912d5ab3cba9c5995f35b5f2e623995cca5 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 19:03:52 +0000
Subject: [PATCH] *Moved and consolidated the running of Phase-mode triggers.

---
 src/forge/EndOfTurn.java |  8 +-------
 src/forge/Phase.java     | 17 ++++++-----------
 src/forge/PhaseUtil.java | 22 ++--------------------
 3 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/src/forge/EndOfTurn.java b/src/forge/EndOfTurn.java
index aca00b8ae7a..14ad932aef5 100644
--- a/src/forge/EndOfTurn.java
+++ b/src/forge/EndOfTurn.java
@@ -20,13 +20,7 @@ public class EndOfTurn implements java.io.Serializable
   public void executeAt()
   {
 	  AllZone.GameAction.checkWheneverKeyword(AllZone.CardFactory.HumanNullCard,"BeginningOfEndStep",null);
-	  
-	//Run Triggers
-  	HashMap<String,Object> runParams = new HashMap<String,Object>();
-  	runParams.put("Phase", Constant.Phase.End_Of_Turn);
-  	runParams.put("Player", AllZone.Phase.getPlayerTurn());
-  	AllZone.TriggerHandler.runTrigger("Phase", runParams);
-	  
+
     //Pyrohemia and Pestilence
     CardList all = AllZoneUtil.getCardsInPlay();
 
diff --git a/src/forge/Phase.java b/src/forge/Phase.java
index 77d3502ab7e..1b54a7b00d0 100644
--- a/src/forge/Phase.java
+++ b/src/forge/Phase.java
@@ -162,6 +162,12 @@ public class Phase extends MyObservable
         final String phase = AllZone.Phase.getPhase();
         final Player turn = AllZone.Phase.getPlayerTurn();
         AllZone.Phase.setSkipPhase(true);
+
+        //Run triggers
+        HashMap<String,Object> runParams = new HashMap<String,Object>();
+		runParams.put("Phase", phase);
+		runParams.put("Player", turn);
+		AllZone.TriggerHandler.runTrigger("Phase", runParams);
         
         if(phase.equals(Constant.Phase.Untap)) {
             PhaseUtil.handleUntap();
@@ -199,12 +205,6 @@ public class Phase extends MyObservable
         
 	    else if(phase.equals(Constant.Phase.Combat_Begin)){
 	    	PhaseUtil.verifyCombat();
-	    	
-	    	//Run triggers
-	    	HashMap<String,Object> runParams = new HashMap<String,Object>();
-	    	runParams.put("Phase", phase);
-	    	runParams.put("Player", getPlayerTurn());
-	    	AllZone.TriggerHandler.runTrigger("Phase", runParams);
 	    }
         
 	    else if (phase.equals(Constant.Phase.Combat_Declare_Attackers_InstantAbility)){
@@ -277,11 +277,6 @@ public class Phase extends MyObservable
 			else{
 				AllZone.EndOfCombat.executeUntil();
 				AllZone.EndOfCombat.executeAt();
-				
-		    	HashMap<String,Object> runParams = new HashMap<String,Object>();
-		    	runParams.put("Phase", phase);
-		    	runParams.put("Player", getPlayerTurn());
-		    	AllZone.TriggerHandler.runTrigger("Phase", runParams);
 			}
         }
 
diff --git a/src/forge/PhaseUtil.java b/src/forge/PhaseUtil.java
index c24407d8d79..e6372ca9795 100644
--- a/src/forge/PhaseUtil.java
+++ b/src/forge/PhaseUtil.java
@@ -46,13 +46,7 @@ public class PhaseUtil {
     		AllZone.Phase.setNeedToNextPhase(true);
     		return;
     	}
-		
-    	//Run triggers
-    	HashMap<String,Object> runParams = new HashMap<String,Object>();
-    	runParams.put("Phase", Constant.Phase.Untap);
-    	runParams.put("Player", AllZone.Phase.getPlayerTurn());
-    	AllZone.TriggerHandler.runTrigger("Phase", runParams);
-		
+
         // Phasing would happen here
         
         doUntap();
@@ -310,12 +304,6 @@ public class PhaseUtil {
 	        return;
 		}
 		
-    	//Run triggers
-    	HashMap<String,Object> runParams = new HashMap<String,Object>();
-    	runParams.put("Phase", Constant.Phase.Upkeep);
-    	runParams.put("Player", AllZone.Phase.getPlayerTurn());
-    	AllZone.TriggerHandler.runTrigger("Phase", runParams);
-		
         GameActionUtil.executeUpkeepEffects();
 	}
 	
@@ -340,13 +328,7 @@ public class PhaseUtil {
     		AllZone.Phase.setNeedToNextPhase(true);
     		return;
     	}
-		
-    	//Run triggers
-    	HashMap<String,Object> runParams = new HashMap<String,Object>();
-    	runParams.put("Phase", Constant.Phase.Draw);
-    	runParams.put("Player", playerTurn);
-    	AllZone.TriggerHandler.runTrigger("Phase", runParams);
-    	
+
     	playerTurn.drawCard();
         GameActionUtil.executeDrawStepEffects();
     }