From d6e6240ea23ea283153a620a1eac2b66e9a4f80d Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Mon, 24 Aug 2015 17:16:15 -0500
Subject: [PATCH] Fixed null pointer exception in handling player disappear in
 ObjectManager

---
 src/services/objects/ObjectManager.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index 2d586f15..47fb7830 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -275,6 +275,8 @@ public class ObjectManager extends Manager {
 			Player p = ((PlayerEventIntent)i).getPlayer();
 			switch (((PlayerEventIntent)i).getEvent()) {
 				case PE_DISAPPEAR:
+					if (p.getCreatureObject() == null)
+						break;
 					p.getCreatureObject().clearAware();
 					objectAwareness.remove(p.getCreatureObject());
 					for (SWGObject obj : p.getCreatureObject().getObservers())