From 1fa00700213d68b2a8a40929938e37e2f90c789f Mon Sep 17 00:00:00 2001 From: Treeku Date: Mon, 16 Jun 2014 21:41:22 +0100 Subject: [PATCH] Add leaveRoom null check incase player is offline --- src/services/chat/ChatService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java index 95747297..204c220b 100644 --- a/src/services/chat/ChatService.java +++ b/src/services/chat/ChatService.java @@ -990,8 +990,10 @@ public class ChatService implements INetworkDispatch { if (playerName.contains(" ")) playerName = playerName.split(" ")[0]; - ChatOnEnteredRoom leaveRoom = new ChatOnEnteredRoom(playerName, 0, roomId, false); - player.getClient().getSession().write(leaveRoom.serialize()); + if (player != null && player.getClient() != null && player.getClient().getSession() != null) { + ChatOnEnteredRoom leaveRoom = new ChatOnEnteredRoom(playerName, 0, roomId, false); + player.getClient().getSession().write(leaveRoom.serialize()); + } room.getUserList().remove(playerName);