From d548e1833504795ed9e7ee4c5c64ef5cbe72dbd5 Mon Sep 17 00:00:00 2001 From: Treeku Date: Fri, 30 May 2014 19:07:46 +0100 Subject: [PATCH] Fixed fatal static errors when buildouts disabled --- src/services/StaticService.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/services/StaticService.java b/src/services/StaticService.java index edefd3f2..bd8679d7 100644 --- a/src/services/StaticService.java +++ b/src/services/StaticService.java @@ -41,6 +41,7 @@ import services.spawn.MobileTemplate; import main.NGECore; import engine.clientdata.ClientFileManager; import engine.clientdata.visitors.PortalVisitor; +import engine.resources.config.Config; import engine.resources.objects.SWGObject; import engine.resources.scene.Planet; import engine.resources.scene.Point3D; @@ -57,6 +58,10 @@ public class StaticService implements INetworkDispatch { } public void spawnStatics() { + Config options = new Config(); + options.setFilePath("options.cfg"); + final boolean buildoutsDisabled = ((options.loadConfigFile() && options.getInt("LOAD.BUILDOUT_OBJECTS") == 0) ? true : false); + for (Planet planet : core.terrainService.getPlanetList()) { if (FileUtilities.doesFileExist("scripts/static_spawns/" + planet.getName())) { Path p = Paths.get("scripts/static_spawns/" + planet.getName()); @@ -65,7 +70,13 @@ public class StaticService implements INetworkDispatch { @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { if (file.getFileName().toString().endsWith(".py")) { - core.scriptService.callScript("scripts/static_spawns/" + planet.getName() + "/", file.getFileName().toString().replace(".py", ""), "addPlanetSpawns", core, planet); + try { + core.scriptService.callScript("scripts/static_spawns/" + planet.getName() + "/", file.getFileName().toString().replace(".py", ""), "addPlanetSpawns", core, planet); + } catch (Exception e) { + if (!buildoutsDisabled) { + e.printStackTrace(); + } + } } return FileVisitResult.CONTINUE;