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

src/main/NGECore.java

@@ -30,6 +30,7 @@ import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 
 
+
 import resources.common.RadialOptions;
 import resources.objects.creature.CreatureObject;
 import services.AttributeService;
@@ -40,6 +41,7 @@ import services.LoginService;
 import services.PlayerService;
 import services.ScriptService;
 import services.SimulationService;
+import services.StaticService;
 import services.TerrainService;
 import services.chat.ChatService;
 import services.combat.CombatService;
@@ -110,6 +112,7 @@ public class NGECore {
 	public CombatService combatService;
 	public PlayerService playerService;
 	public BuffService buffService;
+	public StaticService staticService;
 	
 	// Login Server
 	public NetworkDispatch loginDispatch;
@@ -201,10 +204,16 @@ public class NGECore {
 		terrainService.addPlanet(10, "dathomir", "terrain/dathomir.trn", true);
 		terrainService.loadSnapShotObjects();
 
+
+		
 		// Zone services that need to be loaded after the above
 		simulationService = new SimulationService(this);
 		zoneDispatch.addService(simulationService);
 		
+		// Static Spawns
+		//staticService = new StaticService(this);
+		//staticService.spawnPlanetStaticObjs("rori");
+		
 		guildService = new GuildService(this);
 		zoneDispatch.addService(guildService);