external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

when a second game in the match starts, player will be shown directly the mulligan input

Browse Source
This commit is contained in:
Maxmtg
2013-03-09 06:51:31 +00:00
parent 3e6d4ecc0c
commit d91545cfb3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/forge/game/GameNew.java
View File

@@ -85,7 +85,6 @@ public class GameNew {
* their decks and other special starting conditions. * their decks and other special starting conditions.
*/ */
public static void newGame(final MatchController match, final Map<Player, PlayerStartConditions> playersConditions, final GameState game, final boolean canRandomFoil) { public static void newGame(final MatchController match, final Map<Player, PlayerStartConditions> playersConditions, final GameState game, final boolean canRandomFoil) {
match.getInput().clearInput();
Card.resetUniqueNumber(); Card.resetUniqueNumber();
// need this code here, otherwise observables fail // need this code here, otherwise observables fail

5
src/main/java/forge/game/MatchController.java
View File

@@ -159,7 +159,10 @@ public class MatchController {
final boolean canRandomFoil = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_RANDOM_FOIL) && gameType == GameType.Constructed; final boolean canRandomFoil = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_RANDOM_FOIL) && gameType == GameType.Constructed;
GameNew.newGame(this, startConditions, currentGame, canRandomFoil); GameNew.newGame(this, startConditions, currentGame, canRandomFoil);
getInput().clearInput();
getInput().resetInput();
Thread thGame = new GameInputUpdatesThread(this, currentGame); Thread thGame = new GameInputUpdatesThread(this, currentGame);
thGame.setName("Game input updater"); thGame.setName("Game input updater");
thGame.start(); thGame.start();