From c58ecf366b9aac7b89b031500f005362ee2f1a22 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 8 Dec 2013 09:36:15 +0100 Subject: [PATCH] Fixed possible NPE in GameController. --- .../src/main/java/mage/server/game/GameController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java index 730518dcb21..81e8ecedee3 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameController.java +++ b/Mage.Server/src/main/java/mage/server/game/GameController.java @@ -633,7 +633,14 @@ public class GameController implements GameCallback { private void informOthers(List players) throws MageException { // first player is always original controller - final String message = new StringBuilder(game.getStep().toString()).append(" - Waiting for ").append(game.getPlayer(players.get(0)).getName()).toString(); + Player controller = null; + if (players != null && players.size() > 0) { + controller = game.getPlayer(players.get(0)); + } + if (controller == null) { + return; + } + final String message = new StringBuilder(game.getStep().toString()).append(" - Waiting for ").append(controller.getName()).toString(); for (final Entry entry: gameSessions.entrySet()) { boolean skip = false; for (UUID uuid : players) {