From c390b8ff5c81c26d2992b1588e73cb732fa4cb93 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Fri, 6 Jan 2017 00:23:12 -0600
Subject: [PATCH] Added assertion to spawner loading to verify parent exists

---
 src/services/spawn/StaticService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/services/spawn/StaticService.java b/src/services/spawn/StaticService.java
index 714ee482b..eee7518bb 100644
--- a/src/services/spawn/StaticService.java
+++ b/src/services/spawn/StaticService.java
@@ -39,6 +39,7 @@ import java.util.List;
 import java.util.Map;
 
 import resources.Location;
+import resources.control.Assert;
 import resources.control.Intent;
 import resources.control.Service;
 import resources.objects.SWGObject;
@@ -142,13 +143,12 @@ public class StaticService extends Service {
 		}
 		
 		private SWGObject createObjectInParent(SWGObject parent) {
-			if (parent == null)
-				return null;
+			Assert.notNull(parent);
 			Location loc = new Location(x, y, z, parent.getTerrain());
 			loc.setHeading(heading);
 			SWGObject obj = ObjectCreator.createObjectFromTemplate(iff);
 			obj.setLocation(loc);
-			obj.moveToContainer(parent);
+			parent.addObject(obj);
 			new ObjectCreatedIntent(obj).broadcast();
 			return obj;
 		}