diff --git a/patches/server/Add-exception-reporting-event.patch b/patches/server/Add-exception-reporting-event.patch
index 7bfd222e94..1b361229ee 100644
--- a/patches/server/Add-exception-reporting-event.patch
+++ b/patches/server/Add-exception-reporting-event.patch
@@ -226,9 +226,9 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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 @@ import java.util.concurrent.atomic.AtomicInteger;
- import java.util.concurrent.atomic.AtomicReference;
+@@ -0,0 +0,0 @@ import java.util.concurrent.atomic.AtomicReference;
  import java.util.function.Consumer;
+ import java.util.function.IntUnaryOperator;
  import java.util.logging.Level;
 +import com.destroystokyo.paper.ServerSchedulerReportingWrapper;
 +import com.destroystokyo.paper.event.server.ServerExceptionEvent;
diff --git a/patches/server/Improved-Async-Task-Scheduler.patch b/patches/server/Improved-Async-Task-Scheduler.patch
index 2abe157c16..62bde04640 100644
--- a/patches/server/Improved-Async-Task-Scheduler.patch
+++ b/patches/server/Improved-Async-Task-Scheduler.patch
@@ -349,7 +349,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.addTask(task);
          return task;
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
-         return this.ids.incrementAndGet();
+         return id;
      }
  
 -    private void parsePending() {
diff --git a/patches/server/MC-Utils.patch b/patches/server/MC-Utils.patch
index 2d95a8a38a..a41a24b7d8 100644
--- a/patches/server/MC-Utils.patch
+++ b/patches/server/MC-Utils.patch
@@ -4047,7 +4047,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
 +    static Plugin MINECRAFT = new MinecraftInternalPlugin();
      /**
-      * Counter for IDs. Order doesn't matter, only uniqueness.
+      * The start ID for the counter.
       */
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
          this.runTaskTimer(plugin, (Object) task, delay, period);
diff --git a/patches/server/Timings-v2.patch b/patches/server/Timings-v2.patch
index 7c9c495a69..bcc650feef 100644
--- a/patches/server/Timings-v2.patch
+++ b/patches/server/Timings-v2.patch
@@ -2148,6 +2148,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public Timing timings; // Paper
      private final Plugin plugin;
      private final int id;
+     private final long createdAt = System.nanoTime();
  
 -    final CustomTimingsHandler timings; // Spigot
      CraftTask() {
@@ -2184,7 +2185,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        } // Paper
      }
  
-     long getPeriod() {
+     long getCreatedAt() {
 @@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
          this.next = next;
      }
diff --git a/work/Bukkit b/work/Bukkit
index 5662c2b305..eec4aab001 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 5662c2b3053b90258e479097bd68d21236018b1d
+Subproject commit eec4aab0016f14b085a3a1d573266d6b7b4a0146
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 4e1870454c..b8c522d56d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 4e1870454ce16c8e6dcd761c23bd7aec6a59a879
+Subproject commit b8c522d56d159fb9b7a291f1f7973e67fb41ea66
diff --git a/work/Spigot b/work/Spigot
index 38e6c03da1..d03d7f12a4 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 38e6c03da15d7fc0d08e5ab9b09d3e0acdd470e3
+Subproject commit d03d7f12a440519dd6f4d1491af3a7988a56b5c0