From a9415db2e56798e25afde34cea00442ec17703c3 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 28 Sep 2013 11:56:15 +0200 Subject: [PATCH] Fixing some possible NPE after player left tournamen/match and submits the construct/sideborading panel. --- Mage.Server/src/main/java/mage/server/TableController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java index 99907382747..abf05506844 100644 --- a/Mage.Server/src/main/java/mage/server/TableController.java +++ b/Mage.Server/src/main/java/mage/server/TableController.java @@ -223,13 +223,13 @@ public class TableController { UUID playerId = userPlayerMap.get(userId); if (table.isTournament()) { TournamentPlayer player = tournament.getPlayer(playerId); - if (player.hasQuit()) { + if (player == null || player.hasQuit()) { return true; // so the construct panel closes after submit } } else { if (table.getMatch() != null) { MatchPlayer mPlayer = table.getMatch().getPlayer(playerId); - if (mPlayer.hasQuit()) { + if (mPlayer == null || mPlayer.hasQuit()) { return true; // so the construct panel closes after submit } }