Queues now identify their type in debugger.

DenizenScript · Jul 26, 2013 · cad13ed · cad13ed
1 parent 86e572c
commit cad13ed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/queues/core/Delayable.java b/src/main/java/net/aufdemrand/denizen/scripts/queues/core/Delayable.java
@@ -11,4 +11,6 @@ public interface Delayable {
 
     public void delayFor(Duration duration);
 
+    public boolean isDelayed();
+
 }
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/queues/core/TimedQueue.java b/src/main/java/net/aufdemrand/denizen/scripts/queues/core/TimedQueue.java
@@ -76,6 +76,13 @@ public void delayFor(Duration duration) {
         delay_ticks = System.currentTimeMillis() + duration.getMillis();
     }
 
+    @Override
+    public boolean isDelayed() {
+        if (delay_ticks > System.currentTimeMillis()) return true;
+
+        return false;
+    }
+
 
     public TimedQueue(String id, Duration timing) {
         super(id);
@@ -158,9 +165,8 @@ protected boolean shouldRevolve() {
         if (paused) return false;
 
         // If it's delayed, schedule it for later
-        if (delay_ticks > System.currentTimeMillis()) return false;
+        return !isDelayed();
 
-        return true;
     }