Only utilize script load task if the config.yml specifies a script lo…

…ad delay > 0
magicmq · Mar 27, 2024 · c647c00 · c647c00
1 parent 3734e9e
commit c647c00
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/dev/magicmq/pyspigot/config/PluginConfig.java b/src/main/java/dev/magicmq/pyspigot/config/PluginConfig.java
@@ -46,7 +46,7 @@ public static boolean getMetricsEnabled() {
         return config.getBoolean("metrics-enabled", true);
     }
 
-    public static long getLoadScriptDelay() {
+    public static long getScriptLoadDelay() {
         return config.getLong("script-load-delay", 20L);
     }
 

diff --git a/src/main/java/dev/magicmq/pyspigot/manager/script/ScriptManager.java b/src/main/java/dev/magicmq/pyspigot/manager/script/ScriptManager.java
@@ -51,20 +51,24 @@ public class ScriptManager {
     private final File scriptsFolder;
     private final HashMap<String, Script> scripts;
 
-    private final BukkitTask startScriptTask;
+    private BukkitTask startScriptTask;
 
     private ScriptManager() {
         scriptsFolder = new File(PySpigot.get().getDataFolder(), "scripts");
         this.scripts = new HashMap<>();
 
-        startScriptTask = Bukkit.getScheduler().runTaskLater(PySpigot.get(), this::loadScripts, PluginConfig.getLoadScriptDelay());
+        if (PluginConfig.getScriptLoadDelay() > 0L)
+            startScriptTask = Bukkit.getScheduler().runTaskLater(PySpigot.get(), this::loadScripts, PluginConfig.getScriptLoadDelay());
+        else
+            loadScripts();
     }
 
     /**
      * Called on plugin unload or server shutdown. Gracefully stops and unloads all loaded and running scripts.
      */
     public void shutdown() {
-        startScriptTask.cancel();
+        if (startScriptTask != null)
+            startScriptTask.cancel();
 
         unloadScripts();