From 86dcc5e492db3b33c8180109327a8a7db038d075 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Sat, 20 Jun 2015 17:16:13 -0500
Subject: [PATCH] Added null check for parent in update transform with parent

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

diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index 48964bea..f2f830e7 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -393,6 +393,11 @@ public class ObjectManager extends Manager {
 		Location newLocation = transformWithParent.getLocation();
 		newLocation.setTerrain(obj.getLocation().getTerrain());
 		SWGObject parent = objectMap.get(transformWithParent.getCellId());
+		if (parent == null) {
+			System.err.println("ObjectManager: Could not find parent for transform! Cell: " + transformWithParent.getCellId());
+			Log.e("ObjectManager", "Could not find parent for transform! Cell: %d  Object: %s", transformWithParent.getCellId(), obj);
+			return;
+		}
 		objectAwareness.move(obj, parent, newLocation);
 		obj.sendParentDataTransforms(transformWithParent);
 	}