projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-03 04:16:19 -04:00
Code Issues Projects Releases Wiki Activity

Fixed null error on startup

Browse Source
This commit is contained in:
Waverunner
2014-04-10 15:32:45 -04:00
parent b8b33a5019
commit e23fd23c2a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/NGECore.java
+7 -2
View File
@@ -240,6 +240,11 @@ public class NGECore {
if (!(config.loadConfigFile())) {
config = DefaultConfig.getConfig();
}
Config options = new Config();
options.setFilePath("options.cfg");
boolean optionsConfigLoaded = options.loadConfigFile();
// Database
databaseConnection = new DatabaseConnection();
databaseConnection.connect(config.getString("DB.URL"), config.getString("DB.NAME"), config.getString("DB.USER"), config.getString("DB.PASS"), "postgresql");
@@ -309,7 +314,7 @@ public class NGECore {
aiService = new AIService(this);
//missionService = new MissionService(this);
if (config.getInt("LOAD.RESOURCE.SYSTEM") == 1) {
if (optionsConfigLoaded && options.getInt("LOAD.RESOURCE.SYSTEM") == 1) {
surveyService = new SurveyService(this);
resourceService = new ResourceService(this);
}
@@ -413,7 +418,7 @@ public class NGECore {
objectService.loadBuildings();
if (config.getInt("LOAD.RESOURCE.SYSTEM") == 1) {
if (optionsConfigLoaded && options.getInt("LOAD.RESOURCE.SYSTEM") > 0) {
objectService.loadResourceRoots();
objectService.loadResources();
}