diff options
author | md_5 <git@md-5.net> | 2017-07-25 15:36:44 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2017-07-25 15:36:44 +1000 |
commit | d35483b0e10b2017382a5fb407ecb889483bafaf (patch) | |
tree | 1fd3db97ef01c4254112aa4b1f10e63f59fff9bc /src/main | |
parent | 4670a84bd9db26b4fd013f723f2089ae570ec9ae (diff) | |
download | craftbukkit-d35483b0e10b2017382a5fb407ecb889483bafaf.tar craftbukkit-d35483b0e10b2017382a5fb407ecb889483bafaf.tar.gz craftbukkit-d35483b0e10b2017382a5fb407ecb889483bafaf.tar.lz craftbukkit-d35483b0e10b2017382a5fb407ecb889483bafaf.tar.xz craftbukkit-d35483b0e10b2017382a5fb407ecb889483bafaf.zip |
Correct scheduler behaviour with intervals of >= Integer.MAX_VALUE (circa 3 years).
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java index bdddf0b5..edd7c74d 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -60,10 +60,10 @@ public class CraftScheduler implements BukkitScheduler { private final PriorityQueue<CraftTask> pending = new PriorityQueue<CraftTask>(10, new Comparator<CraftTask>() { public int compare(final CraftTask o1, final CraftTask o2) { - int value = (int) (o1.getNextRun() - o2.getNextRun()); + int value = Long.compare(o1.getNextRun(), o2.getNextRun()); // If the tasks should run on the same tick they should be run FIFO - return value != 0 ? value : o1.getTaskId() - o2.getTaskId(); + return value != 0 ? value : Integer.compare(o1.getTaskId(), o2.getTaskId()); } }); /** |