diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java index 2aa997f9137..c573f0ba4ca 100644 --- a/Mage.Server/src/main/java/mage/server/TableController.java +++ b/Mage.Server/src/main/java/mage/server/TableController.java @@ -155,13 +155,17 @@ public class TableController { if (seat == null) { throw new GameException("No available seats."); } + User user = UserManager.getInstance().getUser(userId); + if (user == null) { + logger.fatal(new StringBuilder("couldn't get user ").append(name).append(" for join tornament userId = ").append(userId).toString()); + return false; + } + if (userPlayerMap.containsKey(userId)){ + user.showUserMessage("Join Table", new StringBuilder("You can join a table only one time.").toString()); + return false; + } Player player = createPlayer(name, seat.getPlayerType(), skill); if (player != null) { - User user = UserManager.getInstance().getUser(userId); - if (user == null) { - logger.fatal(new StringBuilder("couldn't get user ").append(name).append(" for join tornament userId = ").append(userId).toString()); - return false; - } if (!player.canJoinTable(table)) { user.showUserMessage("Join Table", new StringBuilder("A ").append(seat.getPlayerType()).append(" player can't join this table.").toString()); return false;