priorityPassedCount not copied when Game is cloned! Fixed

src/magic/model/MagicGame.java

@@ -113,7 +113,6 @@ public class MagicGame {
 		logMessageBuilder=new MagicLogMessageBuilder(this);
 		payedCost=new MagicPayedCost();
 		changePhase(gameplay.getStartPhase(this));
-
 	}
 	
 	public MagicGame(final MagicGame game,final MagicPlayer scorePlayer) {
@@ -133,6 +132,7 @@ public class MagicGame {
 		this.step=game.step;
 		this.landPlayed=game.landPlayed;
 		this.priorityPassed=game.priorityPassed;
+        this.priorityPassedCount=game.priorityPassedCount;
 		this.stateCheckRequired=game.stateCheckRequired;
 		
         //copied and stored in copyMap
@@ -188,8 +188,8 @@ public class MagicGame {
     public long getGameId() {
 		keys = new long[] { 
             turn,
-            phase.getType().ordinal(),
-            step.ordinal(),
+            phase.hashCode(),
+            step.hashCode(),
             turnPlayer.getIndex(),
             landPlayed,
             priorityPassedCount,

src/magic/model/event/MagicEventAction.java

@@ -3,6 +3,9 @@ package magic.model.event;
 import magic.model.MagicGame;
 
 public interface MagicEventAction {
-
-	public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choiceResults);
-}
+	public void executeEvent(
+            final MagicGame game,
+            final MagicEvent event,
+            final Object[] data,
+            final Object[] choiceResults);
+}

src/magic/model/event/MagicPriorityEvent.java

@@ -6,7 +6,6 @@ import magic.model.MagicSource;
 import magic.model.choice.MagicPlayChoice;
 import magic.model.choice.MagicPlayChoiceResult;
 import magic.model.phase.MagicStep;
-import magic.model.phase.MagicPhaseType;
 
 public class MagicPriorityEvent extends MagicEvent {