add an error check to preloadScripts

DenizenScript · Mar 8, 2021 · f5c2b22 · f5c2b22
1 parent c6edf3b
commit f5c2b22
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/DenizenCore.java b/src/main/java/com/denizenscript/denizencore/DenizenCore.java
@@ -91,11 +91,17 @@ public static void init(DenizenImplementation implementation) {
      * Call postLoadScripts after.
      */
     public static void preloadScripts() {
-        PreScriptReloadScriptEvent.instance.fire();
-        ScriptEvent.worldContainers.clear();
-        implementation.preScriptReload();
-        ScriptHelper.resetError();
-        ScriptHelper.reloadScripts();
+        try {
+            PreScriptReloadScriptEvent.instance.fire();
+            ScriptEvent.worldContainers.clear();
+            implementation.preScriptReload();
+            ScriptHelper.resetError();
+            ScriptHelper.reloadScripts();
+        }
+        catch (Exception ex) {
+            implementation.debugMessage("Error loading scripts:");
+            implementation.debugException(ex);
+        }
     }
 
     /**
@@ -108,7 +114,6 @@ public static void postLoadScripts() {
             OldEventManager.scanWorldEvents();
             ScriptEvent.reload();
             implementation.onScriptReload();
-
         }
         catch (Exception ex) {
             implementation.debugMessage("Error loading scripts:");