From 9290ff2f133a1378eb01f3e2225ba547cb05b3fc Mon Sep 17 00:00:00 2001 From: Light2 Date: Thu, 12 Jun 2014 01:15:39 +0200 Subject: [PATCH] fixed startup error --- scripts/cityRankCaps.py | 6 +++--- src/main/NGECore.java | 2 +- src/services/playercities/PlayerCityService.java | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/cityRankCaps.py b/scripts/cityRankCaps.py index 7669e6c4..02ce24fd 100644 --- a/scripts/cityRankCaps.py +++ b/scripts/cityRankCaps.py @@ -4,10 +4,10 @@ from jarray import array def addCityRankCaps(core): cityService = core.playerCityService - cityService.addCityRankCap('corellia', array([20, 20, 15, 10, 10], 'i') + cityService.addCityRankCap('corellia', array([20, 20, 15, 10, 10], 'i')) cityService.addCityRankCap('dantooine', array([50, 50, 30, 20, 20], 'i')) cityService.addCityRankCap('lok', array([50, 50, 30, 20, 20], 'i')) - cityService.addCityRankCap('naboo', array([20, 20, 15, 10, 10], 'i') + cityService.addCityRankCap('naboo', array([20, 20, 15, 10, 10], 'i')) cityService.addCityRankCap('rori', array([50, 50, 30, 20, 20], 'i')) cityService.addCityRankCap('talus', array([50, 50, 30, 20, 20], 'i')) - cityService.addCityRankCap('tatooine', array([20, 20, 15, 10, 10], 'i') \ No newline at end of file + cityService.addCityRankCap('tatooine', array([20, 20, 15, 10, 10], 'i')) \ No newline at end of file diff --git a/src/main/NGECore.java b/src/main/NGECore.java index 3f7295f4..221cbc28 100644 --- a/src/main/NGECore.java +++ b/src/main/NGECore.java @@ -520,7 +520,7 @@ public class NGECore { staticService.spawnStatics(); equipmentService.loadBonusSets(); - + playerCityService.loadCityRankCaps(); retroService.run(); didServerCrash = false; diff --git a/src/services/playercities/PlayerCityService.java b/src/services/playercities/PlayerCityService.java index 5d497ea5..3751eac1 100644 --- a/src/services/playercities/PlayerCityService.java +++ b/src/services/playercities/PlayerCityService.java @@ -65,6 +65,9 @@ public class PlayerCityService implements INetworkDispatch { public PlayerCityService(NGECore core) { this.core = core; + } + + public void loadCityRankCaps() { core.scriptService.callScript("scripts/", "cityRankCaps", "addCityRankCaps", core); }