Merge branch 'master' of https://github.com/Cardinalstars/ServerUtili…

…ties-Cardinalstar
GTNewHorizons · Oct 7, 2024 · 59c5456 · 59c5456
2 parents c917fa2 + bd99a3e
commit 59c5456
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/serverutils/lib/data/Universe.java b/src/main/java/serverutils/lib/data/Universe.java
@@ -240,6 +240,7 @@ public void scheduleTask(Task task) {
     public void scheduleTask(Task task, boolean condition) {
         if (!condition) return;
         if (task.getNextTime() <= -1) return;
+        task.queueNotifications(this);
         taskQueue.add(task);
     }
 

diff --git a/src/main/java/serverutils/task/Task.java b/src/main/java/serverutils/task/Task.java
@@ -28,8 +28,6 @@ public Task(long whenToRun, Ticks ticks, boolean repeatable) {
         this.interval = getTimeType() == TimeType.MILLIS ? ticks.millis() : ticks.ticks();
         this.nextTime = whenToRun + interval;
         this.repeatable = repeatable;
-
-        queueNotifications(Universe.get());
     }
 
     public abstract void execute(Universe universe);
@@ -51,7 +49,7 @@ public void setNextTime(long time) {
         queueNotifications(Universe.get());
     }
 
-    private void queueNotifications(Universe universe) {
+    public void queueNotifications(Universe universe) {
         List<NotifyTask> notifications = getNotifications();
         if (notifications == null || notifications.isEmpty()) return;
         getNotifications().forEach(universe::scheduleTask);