Update Upstream

Spigot-Server-Patches/Improved-Async-Task-Scheduler.patch

@@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 new file mode 100644
-index 000000000..3c1992e21
+index 0000000000..3c1992e212
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 @@ -0,0 +0,0 @@
@@ -159,7 +159,7 @@ index 000000000..3c1992e21
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 36eecb670..15f165d9b 100644
+index e102be583c..5db848de14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
@@ -169,8 +169,8 @@ index 36eecb670..15f165d9b 100644
 -    private final PriorityQueue<CraftTask> pending = new PriorityQueue<CraftTask>(10,
 +    final PriorityQueue<CraftTask> pending = new PriorityQueue<CraftTask>(10, // Paper
              new Comparator<CraftTask>() {
+                 @Override
                  public int compare(final CraftTask o1, final CraftTask o2) {
-                     int value = Long.compare(o1.getNextRun(), o2.getNextRun());
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
      /**
       * These are tasks that are currently active. It's provided for 'viewing' the current state.
@@ -247,7 +247,7 @@ index 36eecb670..15f165d9b 100644
 +        // Paper end
          final CraftTask task = new CraftTask(
                  new Runnable() {
-                     public void run() {
+                     @Override
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
  
      @Override