From 0739a5826e15b3aca9af7dd3a72b9c93534544b8 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 19 May 2014 08:24:14 +0200 Subject: [PATCH] Added some logic to prevent error if player does not submit a deck in limited format. --- .../server/tournament/TournamentController.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java index 4cf5ea2a376..7e75f22decc 100644 --- a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java +++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java @@ -269,8 +269,20 @@ public class TournamentController { public void timeout(UUID userId) { if (userPlayerMap.containsKey(userId)) { - TournamentPlayer player = tournament.getPlayer(userPlayerMap.get(userId)); - tournament.autoSubmit(userPlayerMap.get(userId), player.generateDeck()); + TournamentPlayer tournamentPlayer = tournament.getPlayer(userPlayerMap.get(userId)); + if (tournamentPlayer.getDeck() != null) { + tournament.autoSubmit(userPlayerMap.get(userId), tournamentPlayer.generateDeck()); + } else { + StringBuilder sb = new StringBuilder(); + User user = UserManager.getInstance().getUser(userId); + if (user != null) { + sb.append(user.getName()); + } + sb.append(" - no deck found for auto submit"); + logger.fatal(sb); + tournamentPlayer.setEliminated(); + tournamentPlayer.setStateInfo("No deck for auto submit"); + } } }