From 5b0465efeb9c5fb6d47d073b9e8bac938707175d Mon Sep 17 00:00:00 2001
From: MrHua269 <novau233@163.com>
Date: Sun, 10 Mar 2024 05:09:51 +0000
Subject: [PATCH] Added a simple watchdog for tick regions

---
 ...d-a-simple-watchdog-for-tick-regions.patch | 257 ++++++++++++++++++
 ... 0016-Io_uring-channel-type-support.patch} |   0
 ...-fixing-folia-spector-teleportation.patch} |   0
 ...-entity-was-moving-to-another-regio.patch} |   0
 ...sync-calling-during-moving-event-be.patch} |   0
 ...020-Piston-fixes-from-molean-server.patch} |   0
 ...u-linear-region-format-and-settings.patch} |   2 +-
 ...aiiju-Don-t-pathfind-outside-region.patch} |   0
 ...ju-Vanilla-end-portal-teleportation.patch} |   0
 ...> 0024-Kaiiju-Async-path-processing.patch} |   0
 ...ch => 0025-Petal-Reduce-sensor-work.patch} |   0
 ...fish-Optimize-entity-coordinate-key.patch} |   0
 ...Cache-climbing-check-for-activation.patch} |   2 +-
 ...ish-Improve-fluid-direction-caching.patch} |   0
 ...029-Pufferfish-Optimize-suffocation.patch} |   2 +-
 ...return-optimization-for-target-find.patch} |   0
 ...erfish-Reduce-chunk-loading-lookups.patch} |   0
 ...ve-container-checking-with-a-bitset.patch} |   2 +-
 ...per-6045-block-goal-shouldn-t-load-.patch} |   0
 ...e-entity-fluid-lookups-if-no-fluids.patch} |   0
 ...heck-for-spooky-season-once-an-hour.patch} |   0
 ...patch => 0036-Pufferfish-Entity-TTL.patch} |   0
 ...ish-Reduce-projectile-chunk-loading.patch} |   0
 ...ferfish-Dynamic-Activation-of-Brain.patch} |   0
 ...le-goal-selector-during-inactive-ti.patch} |   0
 ...ufferfish-Reduce-entity-allocations.patch} |   0
 ...le-Variable-entity-wake-up-duration.patch} |   0
 ...hunks-to-activate-climbing-entities.patch} |   2 +-
 ...=> 0043-Gale-Optimize-sun-burn-tick.patch} |   0
 ...k-frozen-ticks-before-landing-block.patch} |   2 +-
 ...r-lootable-refresh-for-non-player-i.patch} |   2 +-
 ...46-Gale-Use-platform-math-functions.patch} |   0
 ...kip-entity-move-if-movement-is-zero.patch} |   0
 ...ld-generation-chunk-and-block-acces.patch} |   0
 ...0049-Gale-Optimize-noise-generation.patch} |   0
 ...050-Gale-Faster-chunk-serialization.patch} |   0
 ...er-Remove-all-locks-on-region-files.patch} |   0
 ...parkly-Paper-Optimize-canSee-checks.patch} |   2 +-
 ...3-Purpur-use-alternative-keep-alive.patch} |   8 +-
 ....patch => 0054-Leaves-Protocol-Core.patch} |  10 +-
 ...ch => 0055-Leaves-Bladeren-Protocol.patch} |   0
 ...> 0056-Leaves-Fix-Bladeren-Protocol.patch} |   0
 ...0057-Leaves-carpet-protocol-support.patch} |   0
 ...-start-tick-and-finished-tick-event.patch} |   0
 44 files changed, 274 insertions(+), 17 deletions(-)
 create mode 100644 patches/server/0015-Add-a-simple-watchdog-for-tick-regions.patch
 rename patches/server/{0015-Io_uring-channel-type-support.patch => 0016-Io_uring-channel-type-support.patch} (100%)
 rename patches/server/{0016-Try-fixing-folia-spector-teleportation.patch => 0017-Try-fixing-folia-spector-teleportation.patch} (100%)
 rename patches/server/{0017-Teleport-async-if-entity-was-moving-to-another-regio.patch => 0018-Teleport-async-if-entity-was-moving-to-another-regio.patch} (100%)
 rename patches/server/{0018-Prevent-teleportAsync-calling-during-moving-event-be.patch => 0019-Prevent-teleportAsync-calling-during-moving-event-be.patch} (100%)
 rename patches/server/{0019-Piston-fixes-from-molean-server.patch => 0020-Piston-fixes-from-molean-server.patch} (100%)
 rename patches/server/{0020-Kaiiju-linear-region-format-and-settings.patch => 0021-Kaiiju-linear-region-format-and-settings.patch} (99%)
 rename patches/server/{0021-Kaiiju-Don-t-pathfind-outside-region.patch => 0022-Kaiiju-Don-t-pathfind-outside-region.patch} (100%)
 rename patches/server/{0022-Kaiiju-Vanilla-end-portal-teleportation.patch => 0023-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%)
 rename patches/server/{0023-Kaiiju-Async-path-processing.patch => 0024-Kaiiju-Async-path-processing.patch} (100%)
 rename patches/server/{0024-Petal-Reduce-sensor-work.patch => 0025-Petal-Reduce-sensor-work.patch} (100%)
 rename patches/server/{0025-Pufferfish-Optimize-entity-coordinate-key.patch => 0026-Pufferfish-Optimize-entity-coordinate-key.patch} (100%)
 rename patches/server/{0026-Pufferfish-Cache-climbing-check-for-activation.patch => 0027-Pufferfish-Cache-climbing-check-for-activation.patch} (96%)
 rename patches/server/{0027-Pufferfish-Improve-fluid-direction-caching.patch => 0028-Pufferfish-Improve-fluid-direction-caching.patch} (100%)
 rename patches/server/{0028-Pufferfish-Optimize-suffocation.patch => 0029-Pufferfish-Optimize-suffocation.patch} (97%)
 rename patches/server/{0029-Pufferfish-Early-return-optimization-for-target-find.patch => 0030-Pufferfish-Early-return-optimization-for-target-find.patch} (100%)
 rename patches/server/{0030-Pufferfish-Reduce-chunk-loading-lookups.patch => 0031-Pufferfish-Reduce-chunk-loading-lookups.patch} (100%)
 rename patches/server/{0031-Pufferfish-Improve-container-checking-with-a-bitset.patch => 0032-Pufferfish-Improve-container-checking-with-a-bitset.patch} (99%)
 rename patches/server/{0032-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch => 0033-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch} (100%)
 rename patches/server/{0033-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch => 0034-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch} (100%)
 rename patches/server/{0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch => 0035-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch} (100%)
 rename patches/server/{0035-Pufferfish-Entity-TTL.patch => 0036-Pufferfish-Entity-TTL.patch} (100%)
 rename patches/server/{0036-Pufferfish-Reduce-projectile-chunk-loading.patch => 0037-Pufferfish-Reduce-projectile-chunk-loading.patch} (100%)
 rename patches/server/{0037-Pufferfish-Dynamic-Activation-of-Brain.patch => 0038-Pufferfish-Dynamic-Activation-of-Brain.patch} (100%)
 rename patches/server/{0038-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch => 0039-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch} (100%)
 rename patches/server/{0039-Pufferfish-Reduce-entity-allocations.patch => 0040-Pufferfish-Reduce-entity-allocations.patch} (100%)
 rename patches/server/{0040-Gale-Variable-entity-wake-up-duration.patch => 0041-Gale-Variable-entity-wake-up-duration.patch} (100%)
 rename patches/server/{0041-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch => 0042-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch} (97%)
 rename patches/server/{0042-Gale-Optimize-sun-burn-tick.patch => 0043-Gale-Optimize-sun-burn-tick.patch} (100%)
 rename patches/server/{0043-Gale-Check-frozen-ticks-before-landing-block.patch => 0044-Gale-Check-frozen-ticks-before-landing-block.patch} (93%)
 rename patches/server/{0044-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch => 0045-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch} (92%)
 rename patches/server/{0045-Gale-Use-platform-math-functions.patch => 0046-Gale-Use-platform-math-functions.patch} (100%)
 rename patches/server/{0046-Gale-Skip-entity-move-if-movement-is-zero.patch => 0047-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%)
 rename patches/server/{0047-Gale-Optimize-world-generation-chunk-and-block-acces.patch => 0048-Gale-Optimize-world-generation-chunk-and-block-acces.patch} (100%)
 rename patches/server/{0048-Gale-Optimize-noise-generation.patch => 0049-Gale-Optimize-noise-generation.patch} (100%)
 rename patches/server/{0049-Gale-Faster-chunk-serialization.patch => 0050-Gale-Faster-chunk-serialization.patch} (100%)
 rename patches/server/{0050-LinearPaper-Remove-all-locks-on-region-files.patch => 0051-LinearPaper-Remove-all-locks-on-region-files.patch} (100%)
 rename patches/server/{0051-Sparkly-Paper-Optimize-canSee-checks.patch => 0052-Sparkly-Paper-Optimize-canSee-checks.patch} (97%)
 rename patches/server/{0052-Purpur-use-alternative-keep-alive.patch => 0053-Purpur-use-alternative-keep-alive.patch} (94%)
 rename patches/server/{0053-Leaves-Protocol-Core.patch => 0054-Leaves-Protocol-Core.patch} (98%)
 rename patches/server/{0054-Leaves-Bladeren-Protocol.patch => 0055-Leaves-Bladeren-Protocol.patch} (100%)
 rename patches/server/{0055-Leaves-Fix-Bladeren-Protocol.patch => 0056-Leaves-Fix-Bladeren-Protocol.patch} (100%)
 rename patches/server/{0056-Leaves-carpet-protocol-support.patch => 0057-Leaves-carpet-protocol-support.patch} (100%)
 rename patches/server/{0057-Threaded-region-start-tick-and-finished-tick-event.patch => 0058-Threaded-region-start-tick-and-finished-tick-event.patch} (100%)

diff --git a/patches/server/0015-Add-a-simple-watchdog-for-tick-regions.patch b/patches/server/0015-Add-a-simple-watchdog-for-tick-regions.patch
new file mode 100644
index 0000000..44cb370
--- /dev/null
+++ b/patches/server/0015-Add-a-simple-watchdog-for-tick-regions.patch
@@ -0,0 +1,257 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <novau233@163.com>
+Date: Sun, 10 Mar 2024 05:04:33 +0000
+Subject: [PATCH] Add a simple watchdog for tick regions
+
+
+diff --git a/src/main/java/io/papermc/paper/threadedregions/RegionizedServer.java b/src/main/java/io/papermc/paper/threadedregions/RegionizedServer.java
+index fc3d332aa1c1d469cedfe2aaa7102dcd78e25642..1ae61bc6603dd3ac290e3ead20416f9c5b63ff02 100644
+--- a/src/main/java/io/papermc/paper/threadedregions/RegionizedServer.java
++++ b/src/main/java/io/papermc/paper/threadedregions/RegionizedServer.java
+@@ -279,6 +279,7 @@ public final class RegionizedServer {
+      */
+ 
+     private void globalTick(final int tickCount) {
++        me.earthme.luminol.utils.LuminolWatchDog.globalRegionHeartBeat(); //Luminol
+         /*
+         if (false) {
+             io.papermc.paper.threadedregions.ThreadedTicketLevelPropagator.main(null);
+diff --git a/src/main/java/io/papermc/paper/threadedregions/ThreadedRegionizer.java b/src/main/java/io/papermc/paper/threadedregions/ThreadedRegionizer.java
+index 531aa50f2c84e13358e8918bb0c15ea3cd036cb5..fd0053369eb68f0fd596d8acfba4a5247ef8105a 100644
+--- a/src/main/java/io/papermc/paper/threadedregions/ThreadedRegionizer.java
++++ b/src/main/java/io/papermc/paper/threadedregions/ThreadedRegionizer.java
+@@ -167,6 +167,8 @@ public final class ThreadedRegionizer<R extends ThreadedRegionizer.ThreadedRegio
+         if (removed != region) {
+             throw new IllegalStateException("Expected to remove " + region + ", but removed " + removed);
+         }
++
++        me.earthme.luminol.utils.LuminolWatchDog.onRegionDeath(region); //Luminol - Simple watchdog
+     }
+ 
+     public int getSectionCoordinate(final int chunkCoordinate) {
+diff --git a/src/main/java/io/papermc/paper/threadedregions/TickRegions.java b/src/main/java/io/papermc/paper/threadedregions/TickRegions.java
+index 2ad25dd345ab42125d456f2b9cf67d8c4515c8b7..78c50292fb25e8703e9c91db892f05456f07d72f 100644
+--- a/src/main/java/io/papermc/paper/threadedregions/TickRegions.java
++++ b/src/main/java/io/papermc/paper/threadedregions/TickRegions.java
+@@ -402,6 +402,7 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
+ 
+         @Override
+         protected void tickRegion(final int tickCount, final long startTime, final long scheduledEnd) {
++            me.earthme.luminol.utils.LuminolWatchDog.tickRegionHeartBeat(); //Luminol - Simple watchdog
+             final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle profiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler(); // Folia - profiler
+             profiler.startTick(); try { // Folia - profiler
+             MinecraftServer.getServer().tickServer(startTime, scheduledEnd, TimeUnit.MILLISECONDS.toMillis(10L), this.region);
+diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/WatchdogConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/WatchdogConfig.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..71d80b401470db777a86274d32f178bb2aa023d5
+--- /dev/null
++++ b/src/main/java/me/earthme/luminol/config/modules/misc/WatchdogConfig.java
+@@ -0,0 +1,27 @@
++package me.earthme.luminol.config.modules.misc;
++
++import me.earthme.luminol.config.ConfigInfo;
++import me.earthme.luminol.config.EnumConfigCategory;
++import me.earthme.luminol.config.HotReloadUnsupported;
++import me.earthme.luminol.config.IConfigModule;
++
++public class WatchdogConfig implements IConfigModule {
++
++    @HotReloadUnsupported
++    @ConfigInfo(baseName = "enabled")
++    public static boolean enabled = false;
++    @ConfigInfo(baseName = "warn_period_ticks")
++    public static long warnPeriodTicks = 5 * 20;
++    @ConfigInfo(baseName = "timeout_ticks")
++    public static long timeOutTicks = 30 * 20;
++
++    @Override
++    public EnumConfigCategory getCategory() {
++        return EnumConfigCategory.MISC;
++    }
++
++    @Override
++    public String getBaseName() {
++        return "watchdog";
++    }
++}
+diff --git a/src/main/java/me/earthme/luminol/utils/LuminolWatchDog.java b/src/main/java/me/earthme/luminol/utils/LuminolWatchDog.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..6b4368cdf9762ad981345fef0f26cd008a4236ee
+--- /dev/null
++++ b/src/main/java/me/earthme/luminol/utils/LuminolWatchDog.java
+@@ -0,0 +1,161 @@
++package me.earthme.luminol.utils;
++
++import com.google.common.collect.Maps;
++import io.papermc.paper.threadedregions.ThreadedRegionizer;
++import io.papermc.paper.threadedregions.TickRegionScheduler;
++import io.papermc.paper.util.StacktraceDeobfuscator;
++import me.earthme.luminol.config.modules.misc.WatchdogConfig;
++import net.minecraft.server.MinecraftServer;
++import org.apache.commons.lang3.tuple.Pair;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++import org.slf4j.Logger;
++
++import java.lang.management.ManagementFactory;
++import java.lang.management.ThreadInfo;
++import java.util.ArrayList;
++import java.util.List;
++import java.util.Map;
++import java.util.concurrent.CompletableFuture;
++import java.util.concurrent.Executor;
++import java.util.concurrent.TimeUnit;
++
++public class LuminolWatchDog {
++    private static final Object keepaliveDataLock = new Object();
++    private static Pair<Thread,Long> globalRegionLastKeepalive = null;
++    private static final Map<Thread,Pair<ThreadedRegionizer.ThreadedRegion<?,?>,Long>> otherTickRegionKeepalive = Maps.newHashMap();
++    private static final Executor checkTimer = CompletableFuture.delayedExecutor(50, TimeUnit.MILLISECONDS);
++    private static final Logger logger = MinecraftServer.LOGGER;
++    private static int tickCount = 0;
++    private static boolean runScheduleNext = true;
++
++    public static void boot(){
++        runCheck();
++    }
++
++    private static void scheduleCheck(){
++        checkTimer.execute(LuminolWatchDog::runCheck);
++    }
++
++    private static void runCheck(){
++        try {
++            if (MinecraftServer.getServer().isStopped() || !runScheduleNext){
++                return;
++            }
++
++            tickCount++;
++
++            final List<Pair<Thread,Long>> threadsToWarn = new ArrayList<>();
++            final long currentTimeNano = System.nanoTime();
++            boolean shouldStopServer = false;
++
++            synchronized (keepaliveDataLock){
++                if (globalRegionLastKeepalive != null){
++                    final Thread lastGlobalRegionThread = globalRegionLastKeepalive.getLeft();
++                    final long lastTicked = globalRegionLastKeepalive.getRight();
++
++                    final long timeEscaped = currentTimeNano - lastTicked;
++
++                    if (timeEscaped >= WatchdogConfig.warnPeriodTicks * 50 * 1000 * 1000){
++                        threadsToWarn.add(Pair.of(lastGlobalRegionThread,timeEscaped));
++                    }
++                }
++
++                for(Pair<Thread,Long> warnInfo : threadsToWarn){
++                    final Thread targetThread = warnInfo.getLeft();
++                    final long timeEscaped = warnInfo.getRight();
++
++                    final ThreadedRegionizer.ThreadedRegion<?,?> targetRegion;
++
++                    synchronized (keepaliveDataLock){
++                        targetRegion = otherTickRegionKeepalive.get(targetThread).getLeft();
++                    }
++
++                    if (tickCount % WatchdogConfig.warnPeriodTicks == 0){
++                        dumpSingleRegion(targetThread,targetRegion,timeEscaped);
++                    }
++
++                    if (timeEscaped > WatchdogConfig.timeOutTicks * 50 * 1000 * 1000){
++                        shouldStopServer = true;
++                        runScheduleNext = false;
++                    }
++                }
++
++                if (shouldStopServer){
++                    MinecraftServer.getServer().stopServer();
++                }
++            }
++        }finally {
++            if (runScheduleNext){
++                scheduleCheck();
++            }
++        }
++    }
++
++    private static void dumpSingleRegion(@NotNull Thread thread, @Nullable ThreadedRegionizer.ThreadedRegion<?,?> region,long timeEscaped){
++        final StringBuilder messageBuilder = new StringBuilder();
++        messageBuilder.append("====================================").append("\n");
++        messageBuilder.append("There is a single region that has no responding in " + TimeUnit.NANOSECONDS.toSeconds(timeEscaped) + " seconds!").append("\n");
++        messageBuilder.append("If you believe this is a bug,please send it to github issue after checking your plugins!").append("\n");
++        messageBuilder.append("Tick Region: ").append(region == null ? "Global Region" : "ChunkX(Center): " + region.getCenterChunk().x + " ChunkZ(Center): " + region.getCenterChunk().z).append("\n");
++        messageBuilder.append("Thread Name: ").append(thread.getName()).append("\n");
++        messageBuilder.append("Thread Id: ").append(thread.getId()).append("\n");
++
++        final ThreadInfo targetThreadInfo = ManagementFactory.getThreadMXBean().getThreadInfo(thread.getId());
++
++        messageBuilder.append("Is Suspend: ").append(targetThreadInfo.isSuspended()).append("\n");
++        messageBuilder.append("Thread State: ").append(targetThreadInfo.getThreadState()).append("\n");
++        messageBuilder.append("Thread Priority: ").append(targetThreadInfo.getPriority()).append("\n");
++        messageBuilder.append("Thread Stack Trace:").append("\n");
++
++        for (StackTraceElement stackTraceElement : StacktraceDeobfuscator.INSTANCE.deobfuscateStacktrace(thread.getStackTrace())){
++            messageBuilder.append("\t\t").append(stackTraceElement).append("\n");
++        }
++
++        messageBuilder.append("\n");
++        messageBuilder.append("====================================");
++
++        logger.error(messageBuilder.toString());
++    }
++
++    public static void globalRegionHeartBeat(){
++        if (!WatchdogConfig.enabled){
++            return;
++        }
++
++        synchronized (keepaliveDataLock){
++            globalRegionLastKeepalive = Pair.of(Thread.currentThread(),System.nanoTime());
++        }
++    }
++
++    public static void tickRegionHeartBeat(){
++        if (!WatchdogConfig.enabled){
++            return;
++        }
++
++        final ThreadedRegionizer.ThreadedRegion<?,?> currentRegion = TickRegionScheduler.getCurrentRegion();
++
++        if (currentRegion == null) {
++            return;
++        }
++
++        synchronized (keepaliveDataLock){
++            if (!otherTickRegionKeepalive.containsKey(Thread.currentThread())){
++                otherTickRegionKeepalive.put(Thread.currentThread(),Pair.of(currentRegion,System.nanoTime()));
++                return;
++            }
++
++            otherTickRegionKeepalive.replace(Thread.currentThread(),Pair.of(currentRegion,System.nanoTime()));
++        }
++    }
++
++    public static void onRegionDeath(ThreadedRegionizer.ThreadedRegion<?,?> currentRegion){
++        if (!WatchdogConfig.enabled){
++            return;
++        }
++
++        synchronized (keepaliveDataLock){
++            otherTickRegionKeepalive.remove(Thread.currentThread());
++        }
++    }
++}
+\ No newline at end of file
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index dd4fbe5a51e05560343d2ee919d4bc50963e3d70..4d3ba2b02d19cc43a19bc633b9c5df66b85533f7 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -1222,6 +1222,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             this.statusIcon = (ServerStatus.Favicon) this.loadStatusIcon().orElse(null); // CraftBukkit - decompile error
+             this.status = this.buildServerStatus();
+ 
++            me.earthme.luminol.utils.LuminolWatchDog.boot(); //Luminol - Simple watchdog
++
+             // Folia start - region threading
+             if (true) {
+                 io.papermc.paper.threadedregions.RegionizedServer.getInstance().init(); // Folia - region threading - only after loading worlds
diff --git a/patches/server/0015-Io_uring-channel-type-support.patch b/patches/server/0016-Io_uring-channel-type-support.patch
similarity index 100%
rename from patches/server/0015-Io_uring-channel-type-support.patch
rename to patches/server/0016-Io_uring-channel-type-support.patch
diff --git a/patches/server/0016-Try-fixing-folia-spector-teleportation.patch b/patches/server/0017-Try-fixing-folia-spector-teleportation.patch
similarity index 100%
rename from patches/server/0016-Try-fixing-folia-spector-teleportation.patch
rename to patches/server/0017-Try-fixing-folia-spector-teleportation.patch
diff --git a/patches/server/0017-Teleport-async-if-entity-was-moving-to-another-regio.patch b/patches/server/0018-Teleport-async-if-entity-was-moving-to-another-regio.patch
similarity index 100%
rename from patches/server/0017-Teleport-async-if-entity-was-moving-to-another-regio.patch
rename to patches/server/0018-Teleport-async-if-entity-was-moving-to-another-regio.patch
diff --git a/patches/server/0018-Prevent-teleportAsync-calling-during-moving-event-be.patch b/patches/server/0019-Prevent-teleportAsync-calling-during-moving-event-be.patch
similarity index 100%
rename from patches/server/0018-Prevent-teleportAsync-calling-during-moving-event-be.patch
rename to patches/server/0019-Prevent-teleportAsync-calling-during-moving-event-be.patch
diff --git a/patches/server/0019-Piston-fixes-from-molean-server.patch b/patches/server/0020-Piston-fixes-from-molean-server.patch
similarity index 100%
rename from patches/server/0019-Piston-fixes-from-molean-server.patch
rename to patches/server/0020-Piston-fixes-from-molean-server.patch
diff --git a/patches/server/0020-Kaiiju-linear-region-format-and-settings.patch b/patches/server/0021-Kaiiju-linear-region-format-and-settings.patch
similarity index 99%
rename from patches/server/0020-Kaiiju-linear-region-format-and-settings.patch
rename to patches/server/0021-Kaiiju-linear-region-format-and-settings.patch
index 6471736..2568be7 100644
--- a/patches/server/0020-Kaiiju-linear-region-format-and-settings.patch
+++ b/patches/server/0021-Kaiiju-linear-region-format-and-settings.patch
@@ -636,7 +636,7 @@ index 0000000000000000000000000000000000000000..7c034f65bac5aab4c46a8506efa5befe
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index dd4fbe5a51e05560343d2ee919d4bc50963e3d70..df7e9b02c24053b02ef05b38474ec1862ddff30c 100644
+index 4d3ba2b02d19cc43a19bc633b9c5df66b85533f7..b3173889ba86b39bac9d0171a863bf4effbb41b1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -923,7 +923,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0021-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0022-Kaiiju-Don-t-pathfind-outside-region.patch
similarity index 100%
rename from patches/server/0021-Kaiiju-Don-t-pathfind-outside-region.patch
rename to patches/server/0022-Kaiiju-Don-t-pathfind-outside-region.patch
diff --git a/patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0023-Kaiiju-Vanilla-end-portal-teleportation.patch
similarity index 100%
rename from patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch
rename to patches/server/0023-Kaiiju-Vanilla-end-portal-teleportation.patch
diff --git a/patches/server/0023-Kaiiju-Async-path-processing.patch b/patches/server/0024-Kaiiju-Async-path-processing.patch
similarity index 100%
rename from patches/server/0023-Kaiiju-Async-path-processing.patch
rename to patches/server/0024-Kaiiju-Async-path-processing.patch
diff --git a/patches/server/0024-Petal-Reduce-sensor-work.patch b/patches/server/0025-Petal-Reduce-sensor-work.patch
similarity index 100%
rename from patches/server/0024-Petal-Reduce-sensor-work.patch
rename to patches/server/0025-Petal-Reduce-sensor-work.patch
diff --git a/patches/server/0025-Pufferfish-Optimize-entity-coordinate-key.patch b/patches/server/0026-Pufferfish-Optimize-entity-coordinate-key.patch
similarity index 100%
rename from patches/server/0025-Pufferfish-Optimize-entity-coordinate-key.patch
rename to patches/server/0026-Pufferfish-Optimize-entity-coordinate-key.patch
diff --git a/patches/server/0026-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0027-Pufferfish-Cache-climbing-check-for-activation.patch
similarity index 96%
rename from patches/server/0026-Pufferfish-Cache-climbing-check-for-activation.patch
rename to patches/server/0027-Pufferfish-Cache-climbing-check-for-activation.patch
index 6148eab..03f925e 100644
--- a/patches/server/0026-Pufferfish-Cache-climbing-check-for-activation.patch
+++ b/patches/server/0027-Pufferfish-Cache-climbing-check-for-activation.patch
@@ -18,7 +18,7 @@ index 24c05e40c9eeeb4a181d2f9994b0e786393046b9..a899f33c8c6033ad99d8187f29d6e9eb
      private Vec3 deltaMovement;
      private float yRot;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b640d877f924094bcabbf9618bbd9aa0a70bf94a..d38918b973f76e4b3eec5e16ea4f2473e92ae858 100644
+index 2fa76a711a629e38a95b93e473272b8217783f99..3bde76d51ffe48490360d9ff5d27e2aa91c920ca 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
diff --git a/patches/server/0027-Pufferfish-Improve-fluid-direction-caching.patch b/patches/server/0028-Pufferfish-Improve-fluid-direction-caching.patch
similarity index 100%
rename from patches/server/0027-Pufferfish-Improve-fluid-direction-caching.patch
rename to patches/server/0028-Pufferfish-Improve-fluid-direction-caching.patch
diff --git a/patches/server/0028-Pufferfish-Optimize-suffocation.patch b/patches/server/0029-Pufferfish-Optimize-suffocation.patch
similarity index 97%
rename from patches/server/0028-Pufferfish-Optimize-suffocation.patch
rename to patches/server/0029-Pufferfish-Optimize-suffocation.patch
index aa1adcf..1bdfbbb 100644
--- a/patches/server/0028-Pufferfish-Optimize-suffocation.patch
+++ b/patches/server/0029-Pufferfish-Optimize-suffocation.patch
@@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..3e48cd297b4869e5c89b6abc43c726d3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d38918b973f76e4b3eec5e16ea4f2473e92ae858..3731013a4369dac2130045bdc2bbde170075a3df 100644
+index 3bde76d51ffe48490360d9ff5d27e2aa91c920ca..56cee73ec911a171f1e4c1c733436caa504d0b57 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -419,7 +419,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0029-Pufferfish-Early-return-optimization-for-target-find.patch b/patches/server/0030-Pufferfish-Early-return-optimization-for-target-find.patch
similarity index 100%
rename from patches/server/0029-Pufferfish-Early-return-optimization-for-target-find.patch
rename to patches/server/0030-Pufferfish-Early-return-optimization-for-target-find.patch
diff --git a/patches/server/0030-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0031-Pufferfish-Reduce-chunk-loading-lookups.patch
similarity index 100%
rename from patches/server/0030-Pufferfish-Reduce-chunk-loading-lookups.patch
rename to patches/server/0031-Pufferfish-Reduce-chunk-loading-lookups.patch
diff --git a/patches/server/0031-Pufferfish-Improve-container-checking-with-a-bitset.patch b/patches/server/0032-Pufferfish-Improve-container-checking-with-a-bitset.patch
similarity index 99%
rename from patches/server/0031-Pufferfish-Improve-container-checking-with-a-bitset.patch
rename to patches/server/0032-Pufferfish-Improve-container-checking-with-a-bitset.patch
index 4eb59fd..5e713bd 100644
--- a/patches/server/0031-Pufferfish-Improve-container-checking-with-a-bitset.patch
+++ b/patches/server/0032-Pufferfish-Improve-container-checking-with-a-bitset.patch
@@ -459,7 +459,7 @@ index 26ff1a3d07c92f7035020d08d35116f7feede600..009263f6aab41608d7e17bebbed6f962
  
      public static void entityInside(Level world, BlockPos pos, BlockState state, Entity entity, HopperBlockEntity blockEntity) {
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-index a94300a457b25f0e33a8eeabba6dd5720ca9ab1e..b41635dd0569ff7df909df492d3e850aef7214be 100644
+index f52ccd4f3e062af3c7cc6eaea5b074a3bbd21690..a5cd70b6ada2b44f64db0985483ee5eadc67003f 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
 @@ -94,12 +94,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
diff --git a/patches/server/0032-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0033-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch
similarity index 100%
rename from patches/server/0032-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch
rename to patches/server/0033-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch
diff --git a/patches/server/0033-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0034-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch
similarity index 100%
rename from patches/server/0033-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch
rename to patches/server/0034-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch
diff --git a/patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0035-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch
similarity index 100%
rename from patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch
rename to patches/server/0035-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch
diff --git a/patches/server/0035-Pufferfish-Entity-TTL.patch b/patches/server/0036-Pufferfish-Entity-TTL.patch
similarity index 100%
rename from patches/server/0035-Pufferfish-Entity-TTL.patch
rename to patches/server/0036-Pufferfish-Entity-TTL.patch
diff --git a/patches/server/0036-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0037-Pufferfish-Reduce-projectile-chunk-loading.patch
similarity index 100%
rename from patches/server/0036-Pufferfish-Reduce-projectile-chunk-loading.patch
rename to patches/server/0037-Pufferfish-Reduce-projectile-chunk-loading.patch
diff --git a/patches/server/0037-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0038-Pufferfish-Dynamic-Activation-of-Brain.patch
similarity index 100%
rename from patches/server/0037-Pufferfish-Dynamic-Activation-of-Brain.patch
rename to patches/server/0038-Pufferfish-Dynamic-Activation-of-Brain.patch
diff --git a/patches/server/0038-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0039-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
similarity index 100%
rename from patches/server/0038-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
rename to patches/server/0039-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
diff --git a/patches/server/0039-Pufferfish-Reduce-entity-allocations.patch b/patches/server/0040-Pufferfish-Reduce-entity-allocations.patch
similarity index 100%
rename from patches/server/0039-Pufferfish-Reduce-entity-allocations.patch
rename to patches/server/0040-Pufferfish-Reduce-entity-allocations.patch
diff --git a/patches/server/0040-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0041-Gale-Variable-entity-wake-up-duration.patch
similarity index 100%
rename from patches/server/0040-Gale-Variable-entity-wake-up-duration.patch
rename to patches/server/0041-Gale-Variable-entity-wake-up-duration.patch
diff --git a/patches/server/0041-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0042-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch
similarity index 97%
rename from patches/server/0041-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch
rename to patches/server/0042-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch
index 79a69e6..dbbf46e 100644
--- a/patches/server/0041-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch
+++ b/patches/server/0042-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch
@@ -52,7 +52,7 @@ index d62734c0365af706c136274faf3e135f6ea099ee..bc655e3db34630a419be883b0dcc1ba4
          return this.chunkPosition;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3731013a4369dac2130045bdc2bbde170075a3df..39f054b9352376336b543c1ca4e9be9a6dee79b3 100644
+index 56cee73ec911a171f1e4c1c733436caa504d0b57..ea1a603fffc4effd6114eb47361dd35fb03981f0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2046,19 +2046,43 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0042-Gale-Optimize-sun-burn-tick.patch b/patches/server/0043-Gale-Optimize-sun-burn-tick.patch
similarity index 100%
rename from patches/server/0042-Gale-Optimize-sun-burn-tick.patch
rename to patches/server/0043-Gale-Optimize-sun-burn-tick.patch
diff --git a/patches/server/0043-Gale-Check-frozen-ticks-before-landing-block.patch b/patches/server/0044-Gale-Check-frozen-ticks-before-landing-block.patch
similarity index 93%
rename from patches/server/0043-Gale-Check-frozen-ticks-before-landing-block.patch
rename to patches/server/0044-Gale-Check-frozen-ticks-before-landing-block.patch
index cb2b888..7c6ecf3 100644
--- a/patches/server/0043-Gale-Check-frozen-ticks-before-landing-block.patch
+++ b/patches/server/0044-Gale-Check-frozen-ticks-before-landing-block.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Check frozen ticks before landing block
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 39f054b9352376336b543c1ca4e9be9a6dee79b3..7ae3d5a9e44092501271b36e593fe6d7270c472b 100644
+index ea1a603fffc4effd6114eb47361dd35fb03981f0..bd3f1a6447ae59400a18456ea2c2f2fdb24a3f91 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -588,11 +588,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0044-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch b/patches/server/0045-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch
similarity index 92%
rename from patches/server/0044-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch
rename to patches/server/0045-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch
index f6a0c95..1471768 100644
--- a/patches/server/0044-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch
+++ b/patches/server/0045-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Gale Don't trigger lootable refresh for non-player
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-index b41635dd0569ff7df909df492d3e850aef7214be..7ff40b74827a52eb5daaff72e1563b044d41c6c1 100644
+index a5cd70b6ada2b44f64db0985483ee5eadc67003f..e49be65c2d379027c2821c0db7f151bc3cd20a4b 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
 @@ -68,6 +68,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
diff --git a/patches/server/0045-Gale-Use-platform-math-functions.patch b/patches/server/0046-Gale-Use-platform-math-functions.patch
similarity index 100%
rename from patches/server/0045-Gale-Use-platform-math-functions.patch
rename to patches/server/0046-Gale-Use-platform-math-functions.patch
diff --git a/patches/server/0046-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0047-Gale-Skip-entity-move-if-movement-is-zero.patch
similarity index 100%
rename from patches/server/0046-Gale-Skip-entity-move-if-movement-is-zero.patch
rename to patches/server/0047-Gale-Skip-entity-move-if-movement-is-zero.patch
diff --git a/patches/server/0047-Gale-Optimize-world-generation-chunk-and-block-acces.patch b/patches/server/0048-Gale-Optimize-world-generation-chunk-and-block-acces.patch
similarity index 100%
rename from patches/server/0047-Gale-Optimize-world-generation-chunk-and-block-acces.patch
rename to patches/server/0048-Gale-Optimize-world-generation-chunk-and-block-acces.patch
diff --git a/patches/server/0048-Gale-Optimize-noise-generation.patch b/patches/server/0049-Gale-Optimize-noise-generation.patch
similarity index 100%
rename from patches/server/0048-Gale-Optimize-noise-generation.patch
rename to patches/server/0049-Gale-Optimize-noise-generation.patch
diff --git a/patches/server/0049-Gale-Faster-chunk-serialization.patch b/patches/server/0050-Gale-Faster-chunk-serialization.patch
similarity index 100%
rename from patches/server/0049-Gale-Faster-chunk-serialization.patch
rename to patches/server/0050-Gale-Faster-chunk-serialization.patch
diff --git a/patches/server/0050-LinearPaper-Remove-all-locks-on-region-files.patch b/patches/server/0051-LinearPaper-Remove-all-locks-on-region-files.patch
similarity index 100%
rename from patches/server/0050-LinearPaper-Remove-all-locks-on-region-files.patch
rename to patches/server/0051-LinearPaper-Remove-all-locks-on-region-files.patch
diff --git a/patches/server/0051-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0052-Sparkly-Paper-Optimize-canSee-checks.patch
similarity index 97%
rename from patches/server/0051-Sparkly-Paper-Optimize-canSee-checks.patch
rename to patches/server/0052-Sparkly-Paper-Optimize-canSee-checks.patch
index e38ced9..d158985 100644
--- a/patches/server/0051-Sparkly-Paper-Optimize-canSee-checks.patch
+++ b/patches/server/0052-Sparkly-Paper-Optimize-canSee-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Sparkly Paper Optimize canSee checks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c212030a24174115a975604b91d03cf8ad4043de..2fc86eb396ed600154840dd6cd43b9294a34595c 100644
+index 8f642259ab8aa94eb5739ecbe72211c248c1114d..1ef9d716c6c1523c0ee1cb6fd484e2a8ca367adc 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1408,7 +1408,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0052-Purpur-use-alternative-keep-alive.patch b/patches/server/0053-Purpur-use-alternative-keep-alive.patch
similarity index 94%
rename from patches/server/0052-Purpur-use-alternative-keep-alive.patch
rename to patches/server/0053-Purpur-use-alternative-keep-alive.patch
index 7771a79..9469999 100644
--- a/patches/server/0052-Purpur-use-alternative-keep-alive.patch
+++ b/patches/server/0053-Purpur-use-alternative-keep-alive.patch
@@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..43bbc2c30bdd3872a0179e0070403c3e
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 43c8e48ecdf82a17b81fc91c6f602c953067d11c..38564ab781665aeb215734a367bc87271efd3d2a 100644
+index 22f0d91df0a81040d72c499fbff32b3a9d41598f..c68910b2a2eb703406fb406a86783cf6ab48651e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -53,6 +53,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -51,6 +51,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      private long keepAliveTime = Util.getMillis(); // Paper
      private boolean keepAlivePending;
      private long keepAliveChallenge;
@@ -42,7 +42,7 @@ index 43c8e48ecdf82a17b81fc91c6f602c953067d11c..38564ab781665aeb215734a367bc8727
      private int latency;
      private volatile boolean suspendFlushingOnServerThread = false;
      public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
-@@ -105,6 +106,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -103,6 +104,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
@@ -59,7 +59,7 @@ index 43c8e48ecdf82a17b81fc91c6f602c953067d11c..38564ab781665aeb215734a367bc8727
          //PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // CraftBukkit // Paper - handle ServerboundKeepAlivePacket async
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int) (Util.getMillis() - this.keepAliveTime);
-@@ -225,6 +236,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -221,6 +232,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          long currentTime = Util.getMillis();
          long elapsedTime = currentTime - this.keepAliveTime;
  
diff --git a/patches/server/0053-Leaves-Protocol-Core.patch b/patches/server/0054-Leaves-Protocol-Core.patch
similarity index 98%
rename from patches/server/0053-Leaves-Protocol-Core.patch
rename to patches/server/0054-Leaves-Protocol-Core.patch
index cd12769..5d93b2e 100644
--- a/patches/server/0053-Leaves-Protocol-Core.patch
+++ b/patches/server/0054-Leaves-Protocol-Core.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Protocol Core
 
 
 diff --git a/src/main/java/io/papermc/paper/threadedregions/RegionizedServer.java b/src/main/java/io/papermc/paper/threadedregions/RegionizedServer.java
-index fc3d332aa1c1d469cedfe2aaa7102dcd78e25642..bebaa4e7abcbd01dc57fddf2a473b846e887cc7f 100644
+index 1ae61bc6603dd3ac290e3ead20416f9c5b63ff02..168ed2c21aed6a10f3aca259880b1b8bdbf98b78 100644
 --- a/src/main/java/io/papermc/paper/threadedregions/RegionizedServer.java
 +++ b/src/main/java/io/papermc/paper/threadedregions/RegionizedServer.java
-@@ -313,6 +313,8 @@ public final class RegionizedServer {
+@@ -314,6 +314,8 @@ public final class RegionizedServer {
  
          // player list
          MinecraftServer.getServer().getPlayerList().tick();
@@ -36,10 +36,10 @@ index af86f752c33a2990405fea058b7c41c437ba9d46..bada9fae1e7178162429e1f5a1608b9c
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 38564ab781665aeb215734a367bc87271efd3d2a..f8ebb4349004e67d399e44588e159528d31c7be0 100644
+index c68910b2a2eb703406fb406a86783cf6ab48651e..f935214ed80fe54038a96a5cd668a072cdf406ec 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -141,6 +141,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -139,6 +139,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
  
      @Override
      public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -47,7 +47,7 @@ index 38564ab781665aeb215734a367bc87271efd3d2a..f8ebb4349004e67d399e44588e159528
          // Paper start - Brand support
          if (packet.payload() instanceof net.minecraft.network.protocol.common.custom.BrandPayload brandPayload) {
              this.player.clientBrandName = brandPayload.brand();
-@@ -160,6 +161,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -156,6 +157,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                  String channels = payload.toString(com.google.common.base.Charsets.UTF_8);
                  for (String channel : channels.split("\0")) {
                      this.getCraftPlayer().addChannel(channel);
diff --git a/patches/server/0054-Leaves-Bladeren-Protocol.patch b/patches/server/0055-Leaves-Bladeren-Protocol.patch
similarity index 100%
rename from patches/server/0054-Leaves-Bladeren-Protocol.patch
rename to patches/server/0055-Leaves-Bladeren-Protocol.patch
diff --git a/patches/server/0055-Leaves-Fix-Bladeren-Protocol.patch b/patches/server/0056-Leaves-Fix-Bladeren-Protocol.patch
similarity index 100%
rename from patches/server/0055-Leaves-Fix-Bladeren-Protocol.patch
rename to patches/server/0056-Leaves-Fix-Bladeren-Protocol.patch
diff --git a/patches/server/0056-Leaves-carpet-protocol-support.patch b/patches/server/0057-Leaves-carpet-protocol-support.patch
similarity index 100%
rename from patches/server/0056-Leaves-carpet-protocol-support.patch
rename to patches/server/0057-Leaves-carpet-protocol-support.patch
diff --git a/patches/server/0057-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0058-Threaded-region-start-tick-and-finished-tick-event.patch
similarity index 100%
rename from patches/server/0057-Threaded-region-start-tick-and-finished-tick-event.patch
rename to patches/server/0058-Threaded-region-start-tick-and-finished-tick-event.patch