More Upstream tacos

Spigot-Server-Patches/Timings-v2.patch

@@ -524,6 +524,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      public void D() {
+-        SpigotTimings.schedulerTimer.startTiming(); // Spigot
++        MinecraftTimings.bukkitSchedulerTimer.startTiming(); // Paper
+         this.server.getScheduler().mainThreadHeartbeat(this.ticks); // CraftBukkit
+-        SpigotTimings.schedulerTimer.stopTiming(); // Spigot
++        MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Paper
 +        MinecraftTimings.minecraftSchedulerTimer.startTiming(); // Paper
          this.methodProfiler.a("jobs");
          Queue queue = this.j;
@@ -536,13 +541,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
          this.methodProfiler.c("levels");
  
--        SpigotTimings.schedulerTimer.startTiming(); // Spigot
-+        MinecraftTimings.bukkitSchedulerTimer.startTiming(); // Paper
          // CraftBukkit start
-         this.server.getScheduler().mainThreadHeartbeat(this.ticks);
--        SpigotTimings.schedulerTimer.stopTiming(); // Spigot
-+        MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Paper
- 
          // Run tasks that are waiting on processing
 -        SpigotTimings.processQueueTimer.startTiming(); // Spigot
 +        MinecraftTimings.processQueueTimer.startTiming(); // Spigot

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 1faaa340e5d02ab0afdc5c9482ce7e5a5e74c1f7
+Subproject commit 6b843d995ffa4b1d5e50124bb67ea58289598596

work/Spigot

@@ -1 +1 @@
-Subproject commit 65a0f1170c38f06928cf916892ae863abecb6927
+Subproject commit 3996d7d5c02c6a13ff621eb3cb37c17fc7ec1954