diff --git a/src/services/CoreManager.java b/src/services/CoreManager.java index ee1fb7fe7..4b130bfaf 100644 --- a/src/services/CoreManager.java +++ b/src/services/CoreManager.java @@ -104,7 +104,7 @@ public class CoreManager extends Manager { registerForIntent(ServerManagementIntent.TYPE); packetDebug = getConfig(ConfigFile.PRIMARY).getBoolean("PACKET-DEBUG", false); initializePacketOutput(); - Scripts.initialize(getConfig(ConfigFile.PRIMARY)); + initializeScripts(); return galaxy != null && super.initialize(); } @@ -147,6 +147,19 @@ public class CoreManager extends Manager { } } + private void initializeScripts() { + Config c = getConfig(ConfigFile.PRIMARY); + if (!c.getBoolean("LOAD-SCRIPTS", true)) { + System.out.println("CoreManager: Not preloading scripts. Reason: disabled"); + return; + } + System.out.println("CoreManager: Initializing scripts..."); + long start = System.nanoTime(); + Scripts.initialize(getConfig(ConfigFile.PRIMARY)); + long end = System.nanoTime(); + System.out.println("CoreManager: Initialized scripts. Took " + (end-start)/1E6 + "ms"); + } + private void handleServerManagementIntent(ServerManagementIntent i) { switch(i.getEvent()) { case SHUTDOWN: initiateShutdownSequence(i); break;