From ba02d56ef83db0ff6dcf509bbcc5c5100f491112 Mon Sep 17 00:00:00 2001
From: Light2 <light_pswg@yahoo.com>
Date: Sun, 4 May 2014 18:22:27 +0200
Subject: [PATCH] fixed null pointer

---
 src/services/ConnectionService.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/services/ConnectionService.java b/src/services/ConnectionService.java
index b5e5e1e7..faf3b513 100644
--- a/src/services/ConnectionService.java
+++ b/src/services/ConnectionService.java
@@ -279,8 +279,10 @@ public class ConnectionService implements INetworkDispatch {
 		object.setAttachment("disconnectTask", null);
 		
 		List<ScheduledFuture<?>> schedulers = core.playerService.getSchedulers().get(object.getObjectID());
-		schedulers.forEach(s -> s.cancel(true));
-		schedulers.clear();
+		if(schedulers != null) {
+			schedulers.forEach(s -> s.cancel(true));
+			schedulers.clear();
+		}
 		core.playerService.getSchedulers().remove(object.getObjectID());
 		
 		core.getSWGObjectODB().put(object.getObjectID(), object);