projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-30 15:13:10 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/main/NGECore.java
This commit is contained in:
Light2
2013-10-29 15:51:01 +01:00
parent 7ae910431d ceacf7d119
commit 6e84f1dca4
180 changed files with 2441 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/NGECore.java
+10 -2
View File
@@ -31,6 +31,8 @@ import java.util.concurrent.ConcurrentHashMap;
import resources.common.RadialOptions;
import resources.objects.creature.CreatureObject;
import services.AttributeService;
@@ -57,6 +59,7 @@ import services.object.ObjectService;
import services.object.UpdateService;
import services.sui.SUIService;
import services.trade.TradeService;
import services.travel.TravelService;
import engine.clientdata.ClientFileManager;
import engine.clientdata.visitors.CrcStringTableVisitor;
import engine.clientdata.visitors.DatatableVisitor;
@@ -122,6 +125,7 @@ public class NGECore {
public GroupService groupService;
public SkillModService skillModService;
public EquipmentService equipmentService;
public TravelService travelService;
// Login Server
public NetworkDispatch loginDispatch;
@@ -175,6 +179,7 @@ public class NGECore {
groupService = new GroupService(this);
skillModService = new SkillModService(this);
equipmentService = new EquipmentService(this);
travelService = new TravelService(this);
// Ping Server
try {
@@ -200,6 +205,7 @@ public class NGECore {
zoneDispatch.addService(chatService);
zoneDispatch.addService(suiService);
zoneDispatch.addService(mapService);
zoneDispatch.addService(travelService);
zoneDispatch.addService(playerService);
zoneServer = new MINAServer(zoneDispatch, config.getInt("ZONE.PORT"));
@@ -217,9 +223,9 @@ public class NGECore {
terrainService.addPlanet(8, "yavin4", "terrain/yavin4.trn", true);
terrainService.addPlanet(9, "endor", "terrain/endor.trn", true);
terrainService.addPlanet(10, "dathomir", "terrain/dathomir.trn", true);
terrainService.addPlanet(11, "mustafar", "terrain/mustafar.trn", true);
terrainService.addPlanet(12, "kashyyyk_main", "terrain/kashyyyk_main.trn", true);
terrainService.loadSnapShotObjects();
// Zone services that need to be loaded after the above
simulationService = new SimulationService(this);
@@ -228,6 +234,8 @@ public class NGECore {
// Static Spawns
staticService.spawnStatics();
// Travel Points
travelService.loadTravelPoints();
guildService = new GuildService(this);
zoneDispatch.addService(guildService);