From c43521438df58b7766b070868a60ef5b6b9d45c4 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 22 Oct 2014 19:57:28 +0200 Subject: [PATCH] * Fixed that a check for the submitted deck was wrongly also made for limited tournaments. --- .../src/main/java/mage/server/TableController.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java index 370f64a4c52..298f5c2d9da 100644 --- a/Mage.Server/src/main/java/mage/server/TableController.java +++ b/Mage.Server/src/main/java/mage/server/TableController.java @@ -175,9 +175,13 @@ public class TableController { return false; } Deck deck = null; - if (deckList != null) { - deck = Deck.load(deckList, false, false); - + if (!table.getTournament().getTournamentType().isLimited()) { + if (deckList != null) { + deck = Deck.load(deckList, false, false); + } else { + user.showUserMessage("Join Table", "No valid deck selected!"); + return false; + } if (!Main.isTestMode() && !table.getValidator().validate(deck)) { StringBuilder sb = new StringBuilder("You (").append(name).append(") have an invalid deck for the selected ").append(table.getValidator().getName()).append(" Format. \n\n"); for (Map.Entry entry : table.getValidator().getInvalid().entrySet()) {