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

Freeform commander fix
This commit is contained in:
Oleg Agafonov 2019-04-28 20:23:23 +02:00 committed by GitHub
commit cb59442103
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -637,13 +637,18 @@ public class NewTableDialog extends MageDialog {
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 @@ public class NewTableDialog extends MageDialog {
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")