From 3092373d1d21d6df5cb2e289b1a93f26b09df12e Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 28 Aug 2013 15:51:06 +0200 Subject: [PATCH] * Fixed possible NPE in TableController (fixes #298). --- Mage.Server/src/main/java/mage/server/TableController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java index c79af48f7ba..52bb7317962 100644 --- a/Mage.Server/src/main/java/mage/server/TableController.java +++ b/Mage.Server/src/main/java/mage/server/TableController.java @@ -435,7 +435,9 @@ public class TableController { TournamentManager.getInstance().createTournamentSession(tournament, userPlayerMap, table.getId()); for (Entry entry: userPlayerMap.entrySet()) { User user = UserManager.getInstance().getUser(entry.getKey()); - user.tournamentStarted(tournament.getId(), entry.getValue()); + if (user != null) { + user.tournamentStarted(tournament.getId(), entry.getValue()); + } } ServerMessagesUtil.getInstance().incTournamentsStarted(); }