Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	src/services/bazaar/BazaarService.java

src/services/object/ObjectService.java

@@ -100,14 +100,17 @@ import main.NGECore;
 import resources.objects.Delta;
 import resources.objects.building.BuildingObject;
 import resources.objects.cell.CellObject;
+import resources.objects.craft.DraftSchematic;
 import resources.objects.creature.CreatureObject;
 import resources.objects.deed.Harvester_Deed;
 import resources.objects.deed.Player_House_Deed;
+import resources.objects.factorycrate.FactoryCrateObject;
 import resources.objects.group.GroupObject;
 import resources.objects.guild.GuildObject;
 import resources.objects.harvester.HarvesterObject;
 import resources.objects.installation.InstallationObject;
 import resources.objects.intangible.IntangibleObject;
+import resources.objects.manufacture.ManufactureSchematicObject;
 import resources.objects.mission.MissionObject;
 import resources.objects.player.PlayerObject;
 import resources.objects.resource.GalacticResource;
@@ -388,6 +391,18 @@ public class ObjectService implements INetworkDispatch {
 			
 			object = new ResourceContainerObject(objectID, planet, Template, position, orientation);
 			
+		} else if(Template.startsWith("object/factory/shared_factory_crate")) {
+			
+			object = new FactoryCrateObject(objectID, planet, Template, position, orientation);
+			
+		} else if(Template.startsWith("object/draft_schematic")) {
+			
+			object = new DraftSchematic(objectID, planet, Template, position, orientation);
+			
+		} else if(Template.startsWith("object/manufacture_schematic")) {
+			
+			object = new ManufactureSchematicObject(objectID, planet, Template, position, orientation);
+			
 		} else if(Template.startsWith("object/installation/mining_ore/construction")) {
 			
 			float positionY = core.terrainService.getHeight(planet.getID(), position.x, position.z)-1f;
@@ -658,10 +673,24 @@ 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;
 	}
 	
-	private long generateObjectID() {
+	public long generateObjectID() {
 		/*Random random = new Random();
 		
 		long objectID = random.nextInt();