Merge pull request #5756 from mooretc2/freeform-commander-fix

Freeform commander fix
magefree · Apr 28, 2019 · cb59442 · cb59442
2 parents 3beac51 + a05df82
commit cb59442
Showing 1 changed file with 12 additions and 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
@@ -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,12 @@ 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);
+                    return false;
+                }
+                break;
             case "Brawl Two Player Duel":
             case "Brawl Free For All":
                 if (!options.getDeckType().equals("Variant Magic - Brawl")