diff --git a/src/main/java/forge/game/Match.java b/src/main/java/forge/game/Match.java index c810f9bd3d3..283289c3d93 100644 --- a/src/main/java/forge/game/Match.java +++ b/src/main/java/forge/game/Match.java @@ -91,16 +91,17 @@ public class Match { final boolean canRandomFoil = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_RANDOM_FOIL) && gameType == GameType.Constructed; GameNew.newGame(currentGame, canRandomFoil, this.useAnte); - if (useAnte) { // Deciding which cards go to ante - List> list = GameNew.chooseCardsForAnte(currentGame); - GameNew.moveCardsToAnte(list); - currentGame.fireEvent(new GameEventAnteCardsSelected(list)); - } - // This code was run from EDT. currentGame.getAction().invoke(new Runnable() { @Override public void run() { + + if (useAnte) { // Deciding which cards go to ante + List> list = GameNew.chooseCardsForAnte(currentGame); + GameNew.moveCardsToAnte(list); + currentGame.fireEvent(new GameEventAnteCardsSelected(list)); + } + currentGame.getAction().startGame(); } }); diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index 378c065547f..648baa01b5c 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -44,7 +44,6 @@ import forge.card.MagicColor; import forge.card.ability.AbilityFactory; import forge.card.ability.AbilityUtils; import forge.card.cardfactory.CardFactoryUtil; -import forge.card.cost.Cost; import forge.card.mana.ManaCost; import forge.card.mana.ManaPool; import forge.card.replacement.ReplacementResult; @@ -1829,7 +1828,7 @@ public class Player extends GameEntity implements Comparable { adjMax += Integer.valueOf(k[1]); } } - final int adjCheck = this.maxLandsToPlay + adjMax; + final int adjCheck = Player.maxLandsToPlay + adjMax; // System.out.println("Max lands for player " + this.getName() + ": " + adjCheck); return this.numLandsPlayed < adjCheck || this.isCardInPlay("Fastbond") || this.isCardInCommand("Naya"); diff --git a/src/main/java/forge/gui/GuiDialog.java b/src/main/java/forge/gui/GuiDialog.java index aa03c349f56..6ea6fba11f6 100644 --- a/src/main/java/forge/gui/GuiDialog.java +++ b/src/main/java/forge/gui/GuiDialog.java @@ -67,10 +67,16 @@ public class GuiDialog { * a {@link java.lang.String} object. */ public static void message(final String message) { - message(message, UIManager.getString("OptionPane.messageDialogTitle")); + FThreads.invokeInEdtAndWait( new Runnable() { + @Override + public void run() { + message(message, UIManager.getString("OptionPane.messageDialogTitle")); + } + }); } public static void message(final String message, String title) { + JOptionPane.showMessageDialog(null, message, title, JOptionPane.PLAIN_MESSAGE); }