From 4150f04c1869411cb62d291ee6eb00b85902c0fe Mon Sep 17 00:00:00 2001 From: Lyft <127234178+Lyfts@users.noreply.github.com> Date: Wed, 2 Oct 2024 21:18:51 +0200 Subject: [PATCH] fix some tasks queuing notifications while disabled (#118) --- src/main/java/serverutils/lib/data/Universe.java | 1 + src/main/java/serverutils/task/Task.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/serverutils/lib/data/Universe.java b/src/main/java/serverutils/lib/data/Universe.java index 8ae18728..d53d6b44 100644 --- 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 index 73f963aa..63e27baf 100644 --- 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 notifications = getNotifications(); if (notifications == null || notifications.isEmpty()) return; getNotifications().forEach(universe::scheduleTask);