command script late init

plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/CommandScriptContainer.java

@@ -139,6 +139,7 @@ public class CommandScriptContainer extends ScriptContainer {
 
     public CommandScriptContainer(YamlConfiguration configurationSection, String scriptContainerName) {
         super(configurationSection, scriptContainerName);
+        CommandScriptHelper.init();
         CommandScriptHelper.commandScripts.put(getName(), this);
         if (contains("tab complete")) {
             hasProcStyleTabComplete = true;

plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/CommandScriptHelper.java

@@ -32,12 +32,25 @@ public class CommandScriptHelper implements Listener {
     public static Map<String, HelpTopic> helpTopics = null;
     public static final Map<String, CommandScriptContainer> commandScripts = new HashMap<>();
     public static boolean hasCommandInformation = true;
+    public static CommandScriptHelper instance;
+    public static boolean isInitialized = false;
 
     public CommandScriptHelper() {
+        instance = this;
+        if (Settings.cache_commandScriptAutoInit) {
+            init();
+        }
+    }
+
+    public static void init() {
+        if (isInitialized) {
+            return;
+        }
+        isInitialized = true;
         try {
             Server server = Bukkit.getServer();
 
-            server.getPluginManager().registerEvents(this, Denizen.getInstance());
+            server.getPluginManager().registerEvents(instance, Denizen.getInstance());
 
             // Get the CommandMap for the server
             Field commandMapField = server.getClass().getDeclaredField("commandMap");
@@ -136,7 +149,7 @@ public static void syncDenizenCommands() {
      * @see #registerDenizenCommand(DenizenCommand)
      */
     public static void removeDenizenCommands() {
-        if (!hasCommandInformation) {
+        if (!hasCommandInformation || !isInitialized) {
             return;
         }
         for (String command : denizenCommands.keySet()) {
@@ -188,7 +201,7 @@ public static void registerDenizenCommand(DenizenCommand command) {
      * @param command   the command.
      * @param helpTopic the help topic for the command or command alias.
      */
-    private static void forceCommand(String name, DenizenCommand command, HelpTopic helpTopic) {
+    public static void forceCommand(String name, DenizenCommand command, HelpTopic helpTopic) {
         // Override any existing non-DenizenCommand commands, but save them just in case
         // TODO: use fallback prefixes for overridden commands instead?
         if (knownCommands.containsKey(name)) {

plugin/src/main/java/com/denizenscript/denizen/utilities/Settings.java

@@ -90,6 +90,7 @@ public static void refillCache() {
         cache_tagTimeoutUnsafe = config.getBoolean("Tags.Timeout when unsafe", false);
         cache_warningRate = config.getLong("Tags.Warning rate", 10000);
         cache_packetInterception = config.getBoolean("Packets.Interception", true);
+        cache_commandScriptAutoInit = config.getBoolean("Scripts.Command.Auto init", false);
         PlayerFlagHandler.cacheTimeoutSeconds = config.getLong("Saves.Offline player cache timeout", 300);
         PlayerFlagHandler.asyncPreload = config.getBoolean("Saves.Load async on login", true);
         MapTagBasedFlagTracker.skipAllCleanings = config.getBoolean("Saves.Skip flag cleaning", false);
@@ -114,7 +115,8 @@ public static void refillCache() {
             cache_healthTraitBlockDrops, cache_chatAsynchronous, cache_chatMustSeeNPC, cache_chatMustLookAtNPC,
             cache_chatGloballyIfFailedChatTriggers, cache_chatGloballyIfNoChatTriggers,
             cache_chatGloballyIfUninteractable, cache_worldScriptChatEventAsynchronous,
-            cache_tagTimeoutSilent, cache_packetInterception, cache_tagTimeoutUnsafe, cache_createWorldSymbols;
+            cache_tagTimeoutSilent, cache_packetInterception, cache_tagTimeoutUnsafe, cache_createWorldSymbols,
+            cache_commandScriptAutoInit;
 
     public static String cache_getAlternateScriptPath, cache_scriptQueueSpeed, cache_healthTraitRespawnDelay,
             cache_engageTimeoutInSeconds, cache_chatMultipleTargetsFormat, cache_chatNoTargetFormat,

plugin/src/main/resources/config.yml

@@ -55,6 +55,11 @@ Scripts:
     Alternative folder path: 'plugins/Denizen'
   # What character encoding to use. 'default' indicates system default, 'utf8' is suggested as a preferred encoding in most cases.
   Encoding: utf8
+  Command:
+    # If set to 'true', the command scripts engine will automatically initialize when the server loads.
+    # If false, it will only initialize once at least one command script is loaded.
+    # This defaults to false to avoid any possible interference on servers that don't use command scripts.
+    Auto init: false
 
 # The default options for new Denizen NPCs