From 1ea3431eeaad5f766c47a79b6cc9136353aeda9d Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Fri, 27 Apr 2012 18:56:06 +0000
Subject: [PATCH] - Moved the "Start Game" stuff to only after Mulliganing and
 Leylining is finished.

---
 src/main/java/forge/control/input/InputMulligan.java |  5 +++++
 src/main/java/forge/game/GameNew.java                | 10 ++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/forge/control/input/InputMulligan.java b/src/main/java/forge/control/input/InputMulligan.java
index 8ca2ebaec94..cfcb66b140e 100644
--- a/src/main/java/forge/control/input/InputMulligan.java
+++ b/src/main/java/forge/control/input/InputMulligan.java
@@ -94,6 +94,7 @@ public class InputMulligan extends Input {
         for (int i = 0; i < newHand; i++) {
             player.drawCard();
         }
+        AllZone.getGameLog().add("Mulligan", player + " has mulliganed down to " + newHand + " cards.", 0);
         playerRating.notifyHasMulliganed();
         playerRating.notifyOpeningHandSize(newHand);
         return newHand;
@@ -210,6 +211,10 @@ public class InputMulligan extends Input {
 
         ga.checkStateEffects();
         PhaseHandler.setGameBegins(1);
+        AllZone.getGameLog().add("Turn",
+                "Turn " + Singletons.getModel().getGameState().getPhaseHandler().getTurn()
+                    + " (" + Singletons.getModel().getGameState().getPhaseHandler().getPlayerTurn() + ")",
+                0);
         Singletons.getModel().getGameState().getPhaseHandler().setNeedToNextPhase(false);
         PhaseUtil.visuallyActivatePhase(Singletons.getModel().getGameState().getPhaseHandler().getPhase());
 
diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java
index df11c3eb920..4a9708126c4 100644
--- a/src/main/java/forge/game/GameNew.java
+++ b/src/main/java/forge/game/GameNew.java
@@ -178,7 +178,7 @@ public class GameNew {
                     // get card picture so that it is in the image cache
                     // ImageCache.getImage(card);
                 }
-
+
             }
         }
         AllZone.getTriggerHandler().clearSuppression(TriggerType.Transformed);
@@ -289,13 +289,7 @@ public class GameNew {
 
         CMatchUI.SINGLETON_INSTANCE.setCard(AllZone.getHumanPlayer().getCardsIn(ZoneType.Hand).get(0));
 
-        AllZone.getInputControl().setInput(new InputMulligan());
-        PhaseHandler.setGameBegins(1); // is this needed? It's already in InputMulligan...
-
-        AllZone.getGameLog().add("Turn",
-                "Turn " + Singletons.getModel().getGameState().getPhaseHandler().getTurn()
-                    + " (" + Singletons.getModel().getGameState().getPhaseHandler().getPlayerTurn() + ")",
-                0);
+        AllZone.getInputControl().setInput(new InputMulligan());        
     } // newGame()
 
     private static void newGameCleanup() {