From d91545cfb3380134b3f7309e3e3576760af1ea7c Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sat, 9 Mar 2013 06:51:31 +0000 Subject: [PATCH] when a second game in the match starts, player will be shown directly the mulligan input --- src/main/java/forge/game/GameNew.java | 1 - src/main/java/forge/game/MatchController.java | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java index 98c15656cbd..35d695e2785 100644 --- a/src/main/java/forge/game/GameNew.java +++ b/src/main/java/forge/game/GameNew.java @@ -85,7 +85,6 @@ public class GameNew { * their decks and other special starting conditions. */ public static void newGame(final MatchController match, final Map playersConditions, final GameState game, final boolean canRandomFoil) { - match.getInput().clearInput(); Card.resetUniqueNumber(); // need this code here, otherwise observables fail diff --git a/src/main/java/forge/game/MatchController.java b/src/main/java/forge/game/MatchController.java index ea051d1e83d..76f086d8db3 100644 --- a/src/main/java/forge/game/MatchController.java +++ b/src/main/java/forge/game/MatchController.java @@ -159,7 +159,10 @@ public class MatchController { final boolean canRandomFoil = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_RANDOM_FOIL) && gameType == GameType.Constructed; GameNew.newGame(this, startConditions, currentGame, canRandomFoil); - + + getInput().clearInput(); + getInput().resetInput(); + Thread thGame = new GameInputUpdatesThread(this, currentGame); thGame.setName("Game input updater"); thGame.start();