Flatten currentTick incr into file patches

Author: lynxplay

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

@@ -23021,7 +23021,7 @@ index e7510be12644b2edd966c538c84379a3d5fe89b5..8d299a75c80fddc61a2aa4dc5b0dc594
                  thread1 -> {
                      DedicatedServer dedicatedServer1 = new DedicatedServer(
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 93668e31b976cad13d002042a9630ef6e70811e4..638990d0d89aa85285675d05e2a74aed6ceaf2f0 100644
+index cf953706a9de504c93625a2d656509bf95ee98fc..d3cad90499a86e6e93192bc5fe27984f9714cdd6 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -177,7 +177,7 @@ import net.minecraft.world.phys.Vec2;
@@ -23226,7 +23226,7 @@ index 93668e31b976cad13d002042a9630ef6e70811e4..638990d0d89aa85285675d05e2a74aed
          profiler.pop(); // moonrise:run_all_chunk
          profiler.pop(); // moonrise:run_all_tasks
 
-@@ -1196,6 +1291,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1197,6 +1292,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.tickFrame.start();
                      this.runAllTasksAtTickStart(); // Paper - improve tick loop
                      this.tickServer(flag ? () -> false : this::haveTime);
@@ -23240,15 +23240,15 @@ index 93668e31b976cad13d002042a9630ef6e70811e4..638990d0d89aa85285675d05e2a74aed
                      this.tickFrame.end();
                      this.recordEndOfTick(); // Paper - improve tick loop
                      profilerFiller.popPush("nextTickWait");
-@@ -1368,6 +1470,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1369,6 +1471,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      private boolean pollTaskInternal() {
          if (super.pollTask()) {
 +            this.moonrise$executeMidTickTasks(); // Paper - rewrite chunk system
              return true;
          } else {
              boolean ret = false; // Paper - force execution of all worlds, do not just bias the first
-@@ -2543,6 +2646,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2544,6 +2647,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
 

paper-server/patches/features/0021-Incremental-chunk-and-player-saving.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Incremental chunk and player saving
 
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index cc0834ac0ecac9735c7bd399fc7f5b908437676e..c3bb59a755e9c5cb4bb9b5c4f03475c6170a8c3a 100644
+index 79b8222848a488704d1eee89cd6255c967378b2c..4b98ac1a7423d9fe569727ef2ce553b1bdc8464a 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -922,7 +922,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,7 +17,7 @@ index cc0834ac0ecac9735c7bd399fc7f5b908437676e..c3bb59a755e9c5cb4bb9b5c4f03475c6
              var4 = this.saveAllChunks(suppressLogs, flush, force);
          } finally {
              this.isSaving = false;
-@@ -1578,9 +1578,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1579,9 +1579,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
 
          this.ticksUntilAutosave--;

paper-server/patches/features/0026-Optimise-EntityScheduler-ticking.patch

@@ -20,10 +20,10 @@ index a2fbc13105673e926cbaed69221826ebd392140f..a42938e1abd371dba6806e65552fde71
 
      @Override
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index c3bb59a755e9c5cb4bb9b5c4f03475c6170a8c3a..fefc1d9392a6c02531a772ca4ff0aeda2abe27b2 100644
+index 4b98ac1a7423d9fe569727ef2ce553b1bdc8464a..18a380f11f2f5b5dffb1cfcfe8b7bbae6e1301ef 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1692,33 +1692,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1693,33 +1693,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
 

paper-server/patches/features/0029-Optimize-Hoppers.patch

@@ -48,10 +48,10 @@ index 0000000000000000000000000000000000000000..24a2090e068ad3c0d08705050944abdf
 +    }
 +}
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index fefc1d9392a6c02531a772ca4ff0aeda2abe27b2..20efafc39eb219158c5dc126f527cc009fe15b15 100644
+index 18a380f11f2f5b5dffb1cfcfe8b7bbae6e1301ef..624e1434371349257cf950ba586329c4fb59dd6c 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1747,6 +1747,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1748,6 +1748,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              serverLevel.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
              serverLevel.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
              serverLevel.updateLagCompensationTick(); // Paper - lag compensation

paper-server/patches/features/0032-Temp-restore-manual-currentTick-increment.patch

@@ -727,7 +727,7 @@
      protected void runServer() {
          try {
              if (!this.initServer()) {
-@@ -735,26 +_,67 @@
+@@ -735,26 +_,68 @@
              }
 
              this.nextTickTimeNanos = Util.getNanos();
@@ -801,6 +801,7 @@
 +                this.lastOverloadWarningNanos = this.nextTickTimeNanos;
 +
 +                this.currentTickStart = tickStart;
++                ++MinecraftServer.currentTick;
 +                // Paper end - improve tick loop
 
                  boolean flag = l == 0L;