From e3c03329249144a6b46d2080b0cee6fe7c416c4a Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Sun, 13 Apr 2014 17:29:05 +0100
Subject: [PATCH] serverTemplates now load on login

Make sure your script setup() funcs don't have anything in them that
can't be run twice
---
 src/services/object/ObjectService.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java
index 59640e4a..7c512e91 100644
--- a/src/services/object/ObjectService.java
+++ b/src/services/object/ObjectService.java
@@ -656,7 +656,21 @@ public class ObjectService implements INetworkDispatch {
 	}
 	
 	public CreatureObject getCreatureFromDB(long objectId) {
-		return core.getCreatureODB().get(new Long(objectId), Long.class, CreatureObject.class);
+		CreatureObject object = core.getCreatureODB().get(new Long(objectId), Long.class, CreatureObject.class);
+		
+		if (object != null && getObject(object.getObjectID()) == null) {
+			loadServerTemplate(object);
+			
+			object.viewChildren(object, true, true, new Traverser() {
+				
+				public void process(SWGObject child) {
+					loadServerTemplate(child);
+				}
+				
+			});
+		}
+		
+		return object;
 	}
 	
 	public long generateObjectID() {