error handling and force-instant for proc tag base

DenizenScript · Apr 12, 2021 · 2259069 · 2259069
1 parent fe92d31
commit 2259069
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/tags/core/ProcedureScriptTagBase.java b/src/main/java/com/denizenscript/denizencore/tags/core/ProcedureScriptTagBase.java
@@ -1,5 +1,6 @@
 package com.denizenscript.denizencore.tags.core;
 
+import com.denizenscript.denizencore.objects.core.DurationTag;
 import com.denizenscript.denizencore.scripts.queues.ScriptQueue;
 import com.denizenscript.denizencore.tags.TagRunnable;
 import com.denizenscript.denizencore.objects.core.ListTag;
@@ -74,13 +75,16 @@ public void procedureTag(ReplaceableTagEvent event) {
         }
         ScriptQueue queue = ScriptUtilities.createAndStartQueue(script.getContainer(), path, event.getContext().getScriptEntryData(), null, (q) -> {
             q.procedural = true;
-        }, null, null, definitions, script.getContainer());
+        }, new DurationTag(0), null, definitions, script.getContainer());
         if (queue == null) {
             attribute.echoError("Procedure queue start failed.");
             return;
         }
-        if (queue.determinations != null && queue.determinations.size() > 0) {
-            event.setReplacedObject(CoreUtilities.autoAttribTyped(queue.determinations.getObject(0), attribute.fulfill(1)));
+        attribute.fulfill(1);
+        if (queue.determinations == null || queue.determinations.size() == 0) {
+            attribute.echoError("Procedure call did not determine any value.");
+            return;
         }
+        event.setReplacedObject(CoreUtilities.autoAttribTyped(queue.determinations.getObject(0), attribute));
     }
 }