projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-14 00:02:07 -04:00
Code Issues Projects Releases Wiki Activity

Merge conflict resolve

Browse Source
This commit is contained in:
CharonInferar
2014-08-09 18:17:01 +02:00
parent 79d56ca4ef a8a824b8a7
commit 0f8466bf44
1452 changed files with 14987 additions and 14349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/NGECore.java
+28 -28
View File
@@ -62,7 +62,6 @@ import services.BuffService;
import services.CharacterService;
import services.ConnectionService;
import services.ConversationService;
import services.DevService;
import services.EntertainmentService;
import services.GroupService;
import services.housing.HousingService;
@@ -199,7 +198,6 @@ public class NGECore {
public AIService aiService;
public MissionService missionService;
public InstanceService instanceService;
public DevService devService;
public SurveyService surveyService;
public ResourceService resourceService;
public ConversationService conversationService;
@@ -236,8 +234,6 @@ public class NGECore {
private BusConfiguration eventBusConfig = BusConfiguration.Default(1, new ThreadPoolExecutor(1, 4, 1, TimeUnit.MINUTES, new LinkedBlockingQueue<Runnable>()));
private ObjectDatabase auctionODB;
private ObjectDatabase resourcesODB;
private ObjectDatabase resourceRootsODB;
private ObjectDatabase resourceHistoryODB;
private ObjectDatabase swgObjectODB;
private ObjectDatabase bountiesODB;
@@ -316,8 +312,6 @@ public class NGECore {
objectIdODB = new ObjectDatabase("oids", true, true, true, ObjectId.class);
duplicateIdODB = new ObjectDatabase("doids", true, true, true, DuplicateId.class);
chatRoomODB = new ObjectDatabase("chatRooms", true, true, true, ChatRoom.class);
resourcesODB = new ObjectDatabase("resources", true, true, true, GalacticResource.class);
resourceRootsODB = new ObjectDatabase("resourceroots", true, true, true, ResourceRoot.class);
resourceHistoryODB = new ObjectDatabase("resourcehistory", true, true, true, GalacticResource.class);
auctionODB = new ObjectDatabase("auction", true, true, true, AuctionItem.class);
bountiesODB = new ObjectDatabase("bounties", true, true, true, BountyListItem.class);
@@ -359,6 +353,11 @@ public class NGECore {
reverseEngineeringService = new ReverseEngineeringService(this);
petService = new PetService(this);
if (optionsConfigLoaded && options.getInt("LOAD.RESOURCE.SYSTEM") == 1) {
surveyService = new SurveyService(this);
resourceService = new ResourceService(this);
}
if (config.keyExists("JYTHONCONSOLE.PORT")) {
int jythonPort = config.getInt("JYTHONCONSOLE.PORT");
if (jythonPort > 0) {
@@ -375,13 +374,7 @@ public class NGECore {
missionService = new MissionService(this);
invasionService = new InvasionService(this);
if (optionsConfigLoaded && options.getInt("LOAD.RESOURCE.SYSTEM") == 1) {
surveyService = new SurveyService(this);
resourceService = new ResourceService(this);
}
// Ping Server
if(config.keyExists("PING.PORT"))
if (config.getInt("PING.PORT") != 0) {
@@ -507,6 +500,10 @@ public class NGECore {
//end terrainList
if (optionsConfigLoaded && options.getInt("LOAD.RESOURCE.SYSTEM") > 0) {
resourceService.loadResources();
}
chatService.loadChatRooms();
spawnService = new SpawnService(this);
@@ -516,11 +513,6 @@ public class NGECore {
simulationService = new SimulationService(this);
if (optionsConfigLoaded && options.getInt("LOAD.RESOURCE.SYSTEM") > 0) {
resourceService.loadResourceRoots();
resourceService.loadResources();
}
terrainService.loadSnapShotObjects();
objectService.loadServerTemplates();
objectService.loadBuildings();
@@ -711,14 +703,6 @@ public class NGECore {
public ObjectDatabase getBountiesODB() {
return bountiesODB;
}
public ObjectDatabase getResourcesODB() {
return resourcesODB;
}
public ObjectDatabase getResourceRootsODB() {
return resourceRootsODB;
}
public ObjectDatabase getResourceHistoryODB() {
return resourceHistoryODB;
@@ -819,8 +803,26 @@ public class NGECore {
} catch (InterruptedException e) {
e.printStackTrace();
}
}
public void initiateStop() {
if(isShuttingDown)
return;
try {
chatService.broadcastGalaxy("You will now be disconnected so the server can perform a final save before shutting down.");
Thread.sleep(10000);
synchronized(getActiveConnectionsMap()) {
for(Client client : getActiveConnectionsMap().values()) {
client.getSession().close(true);
connectionService.disconnect(client);
}
}
System.exit(0);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
@@ -833,8 +835,6 @@ public class NGECore {
mailODB.close();
guildODB.close();
chatRoomODB.close();
resourcesODB.close();
resourceRootsODB.close();
resourceHistoryODB.close();
objectIdODB.close();
duplicateIdODB.close();