From be62669e4ba18a284166c1deec442d3dec417599 Mon Sep 17 00:00:00 2001 From: mooretc2 Date: Wed, 24 Apr 2019 16:52:50 -0700 Subject: [PATCH 1/2] Fixing issue with Freeform Commander deck type --- .../main/java/mage/client/dialog/NewTableDialog.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java index f433f0c0cb5c..75dbd06dc8aa 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java @@ -637,13 +637,18 @@ private boolean checkMatchOptions(MatchOptions options) { case "Variant Magic - Commander": case "Variant Magic - Duel Commander": case "Variant Magic - MTGO 1v1 Commander": - case "Variant Magic - Freeform Commander": case "Variant Magic - Penny Dreadful Commander": if (!options.getGameType().startsWith("Commander")) { JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Commander needs also a Commander game type", "Error", JOptionPane.ERROR_MESSAGE); return false; } break; + case "Variant Magic - Freeform Commander": + if (!options.getGameType().startsWith("Freeform Commander")) { + JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Freeform Commander needs also a Freeform Commander game type", "Error", JOptionPane.ERROR_MESSAGE); + return false; + } + break; case "Variant Magic - Brawl": case "Variant Magic - Duel Brawl": if (!options.getGameType().startsWith("Brawl")) { @@ -678,6 +683,11 @@ private boolean checkMatchOptions(MatchOptions options) { return false; } break; + case "Freeform Commander Free For All": + if (!options.getDeckType().equals("Variant Magic - Freeform Commander")){ + JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Freeform Commander needs also a Freeform Commander game type", "Error", JOptionPane.ERROR_MESSAGE); + } + break; case "Brawl Two Player Duel": case "Brawl Free For All": if (!options.getDeckType().equals("Variant Magic - Brawl") From a05df82f75569ee9bb7a154891ac317a4fa38a5a Mon Sep 17 00:00:00 2001 From: mooretc2 Date: Wed, 24 Apr 2019 17:10:31 -0700 Subject: [PATCH 2/2] Adding missing return --- Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java index 75dbd06dc8aa..c488ff962171 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java @@ -686,6 +686,7 @@ private boolean checkMatchOptions(MatchOptions options) { case "Freeform Commander Free For All": if (!options.getDeckType().equals("Variant Magic - Freeform Commander")){ JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Freeform Commander needs also a Freeform Commander game type", "Error", JOptionPane.ERROR_MESSAGE); + return false; } break; case "Brawl Two Player Duel":