use isQueued & isCurrentlyRunning if isCancelled is not available

HSGamer · Aug 18, 2023 · c789d17 · c789d17
1 parent 071a498
commit c789d17
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/...it-scheduler/src/main/java/me/hsgamer/hscore/bukkit/scheduler/bukkit/BukkitScheduler.java b/...it-scheduler/src/main/java/me/hsgamer/hscore/bukkit/scheduler/bukkit/BukkitScheduler.java
@@ -83,20 +83,18 @@ static BukkitRunnable wrapRunnable(Entity entity, Runnable runnable, Runnable re
 
   static Task wrapTask(BukkitTask bukkitTask, boolean repeating) {
     return new Task() {
-      boolean cancelled = false;
-
       @Override
       public boolean isCancelled() {
         try {
           return bukkitTask.isCancelled();
         } catch (Throwable throwable) {
-          return cancelled; // For old versions that don't have isCancelled()
+          int taskId = bukkitTask.getTaskId();
+          return !(Bukkit.getScheduler().isQueued(taskId) || Bukkit.getScheduler().isCurrentlyRunning(taskId));
         }
       }
 
       @Override
       public void cancel() {
-        cancelled = true;
         bukkitTask.cancel();
       }