From bdf091daafd5c7dbf7c94c29ea2b8e3bfa5d2446 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Sun, 26 Jun 2011 14:44:28 +0400 Subject: [PATCH] Forgot to commit class. +NPE fix on disconnect. --- .../src/main/java/mage/client/remote/CallbackClientImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java index a10572b810a..d03eb4c49c8 100644 --- a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java +++ b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java @@ -80,6 +80,9 @@ public class CallbackClientImpl implements CallbackClient { public void run() { try { logger.info(callback.getMessageId() + " -- " + callback.getMethod()); + if (callback.getMethod() == null) { // may happen on disconnect + return; + } if (callback.getMethod().equals("startGame")) { TableClientMessage message = (TableClientMessage) callback.getData(); GameManager.getInstance().setCurrentPlayerUUID(message.getPlayerId());