don't kill queues waiting on nothing

DenizenScript · Jan 1, 2023 · 8281d9a · 8281d9a
1 parent cf2a93a
commit 8281d9a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/queues/ScriptQueue.java b/src/main/java/com/denizenscript/denizencore/scripts/queues/ScriptQueue.java
@@ -295,7 +295,7 @@ public final TimedQueue forceToTimed(TimedQueue.DelayTracker delay) {
         newQueue.script = script;
         newQueue.holdingOn = holdingOn;
         newQueue.callBack(r);
-        if (newQueue.script_entries.isEmpty()) {
+        if (newQueue.script_entries.isEmpty() && newQueue.holdingOn == null) {
             newQueue.stop();
         }
         else {
@@ -322,7 +322,7 @@ public final void start(boolean doBasicConfig) {
         if (is_started) {
             return;
         }
-        if (script_entries.isEmpty()) {
+        if (script_entries.isEmpty() && holdingOn == null) {
             return;
         }
         if (CoreConfiguration.verifyThreadMatches && !DenizenCore.isMainThread()) {
@@ -418,6 +418,9 @@ public final void stop() {
 
     public final void setLastEntryExecuted(ScriptEntry entry) {
         lastEntryExecuted = entry;
+        if (entry != null) {
+            entry.queue = this;
+        }
     }
 
     public final ScriptEntry getNext() {

diff --git a/src/main/java/com/denizenscript/denizencore/scripts/queues/core/InstantQueue.java b/src/main/java/com/denizenscript/denizencore/scripts/queues/core/InstantQueue.java
@@ -12,7 +12,7 @@ public InstantQueue(String id) {
     @Override
     public void onStart() {
         while (is_started) {
-            if (script_entries.isEmpty()) {
+            if (script_entries.isEmpty() && holdingOn == null) {
                 stop();
                 return;
             }

diff --git a/src/main/java/com/denizenscript/denizencore/scripts/queues/core/TimedQueue.java b/src/main/java/com/denizenscript/denizencore/scripts/queues/core/TimedQueue.java
@@ -105,7 +105,7 @@ public TimedQueue setSpeed(long ticks) {
     @Override
     public void onStart() {
         revolve();
-        if (script_entries.isEmpty()) {
+        if (script_entries.isEmpty() && holdingOn == null) {
             return;
         }
         DenizenCore.timedQueues.add(this);
@@ -127,7 +127,7 @@ public final void tryRevolveOnce() {
     }
 
     public void revolve() {
-        if (script_entries.isEmpty()) {
+        if (script_entries.isEmpty() && holdingOn == null) {
             if (!waitWhenEmpty) {
                 stop();
             }
@@ -137,7 +137,7 @@ public void revolve() {
             return;
         }
         ScriptEngine.revolve(this);
-        if (script_entries.isEmpty() && !waitWhenEmpty) {
+        if (script_entries.isEmpty() && holdingOn == null && !waitWhenEmpty) {
             stop();
         }
     }