From 8d5c094b0d61fd3d84364a980dfc7eb4243cca16 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Mon, 18 Jan 2016 01:52:43 -0600
Subject: [PATCH] Fixed null pointer exception in update containment

---
 src/resources/objects/SWGObject.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java
index b55c95b68..f5ff44cd2 100644
--- a/src/resources/objects/SWGObject.java
+++ b/src/resources/objects/SWGObject.java
@@ -198,7 +198,8 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
 		// Get a pre-parent-removal list of the observers so we can send create/destroy/update messages
 		Set<SWGObject> oldObservers = getObservers();
 		Player prevOwner = getOwner();
-		oldObservers.add(prevOwner.getCreatureObject());
+		if (prevOwner != null)
+			oldObservers.add(prevOwner.getCreatureObject());
 
 		// Remove this object from the old parent if one exists
 		SWGObject oldParent = null;
@@ -213,7 +214,8 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
 		// Observer notification
 		Player newOwner = getOwner();
 		Set<SWGObject> containerObservers = getObservers();
-		containerObservers.add(newOwner.getCreatureObject());
+		if (newOwner != null)
+			containerObservers.add(newOwner.getCreatureObject());
 		if (prevOwner != newOwner) {
 			if (prevOwner != null)
 				oldObservers.add(prevOwner.getCreatureObject());