smarter error source tracking

DenizenScript · Jun 27, 2018 · 5c6ace5 · 5c6ace5
1 parent 844235c
commit 5c6ace5
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/utilities/debugging/dB.java b/plugin/src/main/java/net/aufdemrand/denizen/utilities/debugging/dB.java
@@ -8,6 +8,7 @@
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.objects.dScript;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
+import net.aufdemrand.denizencore.scripts.commands.CommandExecuter;
 import net.aufdemrand.denizencore.scripts.queues.ScriptQueue;
 import net.aufdemrand.denizencore.tags.TagManager;
 import net.aufdemrand.denizencore.utilities.debugging.Debuggable;
@@ -225,6 +226,9 @@ public static void echoError(String message) {
     }
 
     public static void echoError(ScriptQueue source, String message) {
+        if (source == null) {
+            source = CommandExecuter.currentQueue;
+        }
         dScript script = null;
         if (source != null && source.getEntries().size() > 0 && source.getEntries().get(0).getScript() != null) {
             script = source.getEntries().get(0).getScript();
@@ -297,6 +301,9 @@ public static void echoError(Throwable ex) {
     }
 
     public static void echoError(ScriptQueue source, Throwable ex) {
+        if (source == null) {
+            source = CommandExecuter.currentQueue;
+        }
         if (ThrowErrorEvent) {
             ThrowErrorEvent = false;
             Map<String, dObject> context = new HashMap<String, dObject>();