projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-08 23:12:57 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	scripts/demo.py
	src/resources/common/Opcodes.java
This commit is contained in:
Treeku
2013-11-05 05:44:12 +00:00
parent 90f2eec454 d67b8bdc46
commit 67e4333171
193 changed files with 2943 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/NGECore.java
+29 -3
View File
@@ -31,12 +31,16 @@ import java.util.concurrent.ConcurrentHashMap;
import resources.common.RadialOptions;
import resources.common.ThreadMonitor;
import resources.objects.creature.CreatureObject;
import services.AttributeService;
import services.BuffService;
import services.CharacterService;
import services.ConnectionService;
import services.EquipmentService;
import services.GroupService;
import services.LoginService;
import services.PlayerService;
@@ -57,6 +61,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 +127,8 @@ public class NGECore {
public GroupService groupService;
public SkillService skillService;
public SkillModService skillModService;
public EquipmentService equipmentService;
public TravelService travelService;
// Login Server
public NetworkDispatch loginDispatch;
@@ -141,12 +148,25 @@ public class NGECore {
public void start() {
instance = this;
final ThreadMonitor deadlockDetector = new ThreadMonitor();
Thread deadlockMonitor = new Thread(new Runnable() {
@Override
public void run() {
try {
deadlockDetector.findDeadlock();
Thread.sleep(60000);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
});
deadlockMonitor.start();
config = new Config();
config.setFilePath("nge.cfg");
if (!(config.loadConfigFile())) {
config = DefaultConfig.getConfig();
}
// Database
databaseConnection = new DatabaseConnection();
databaseConnection.connect(config.getString("DB.URL"), config.getString("DB.NAME"), config.getString("DB.USER"), config.getString("DB.PASS"), "postgresql");
@@ -161,6 +181,7 @@ public class NGECore {
connectionService = new ConnectionService(this);
characterService = new CharacterService(this);
mapService = new MapService(this);
travelService = new TravelService(this);
objectService = new ObjectService(this);
terrainService = new TerrainService(this);
@@ -176,6 +197,8 @@ public class NGECore {
groupService = new GroupService(this);
skillService = new SkillService(this);
skillModService = new SkillModService(this);
equipmentService = new EquipmentService(this);
// Ping Server
try {
@@ -201,6 +224,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"));
@@ -218,9 +242,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);
@@ -229,6 +253,8 @@ public class NGECore {
// Static Spawns
staticService.spawnStatics();
// Travel Points
travelService.loadTravelPoints();
guildService = new GuildService(this);
zoneDispatch.addService(guildService);