diff --git a/patches/server/0300-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0300-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
new file mode 100644
index 0000000000..99b56c8ca0
--- /dev/null
+++ b/patches/server/0300-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
@@ -0,0 +1,390 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Wed, 6 May 2020 04:53:35 -0400
+Subject: [PATCH] Optimize Network Manager and add advanced packet support
+
+Adds ability for 1 packet to bundle other packets to follow it
+Adds ability for a packet to delay sending more packets until a state is ready.
+
+Removes synchronization from sending packets
+Removes processing packet queue off of main thread
+  - for the few cases where it is allowed, order is not necessary nor
+    should it even be happening concurrently in first place (handshaking/login/status)
+
+Ensures packets sent asynchronously are dispatched on main thread
+
+This helps ensure safety for ProtocolLib as packet listeners
+are commonly accessing world state. This will allow you to schedule
+a packet to be sent async, but itll be dispatched sync for packet
+listeners to process.
+
+This should solve some deadlock risks
+
+Also adds Netty Channel Flush Consolidation to reduce the amount of flushing
+
+Also avoids spamming closed channel exception by rechecking closed state in dispatch
+and then catch exceptions and close if they fire.
+
+Part of this commit was authored by: Spottedleaf, sandtechnology
+
+diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
+index 9f8fbb8231b60c287c9442365c2f95cde92969b8..d8ae86dcc07872c63064782c9864b873f07139d1 100644
+--- a/src/main/java/net/minecraft/network/Connection.java
++++ b/src/main/java/net/minecraft/network/Connection.java
+@@ -84,7 +84,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+         return new DefaultEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Local Client IO #%d").setDaemon(true).build());
+     });
+     private final PacketFlow receiving;
+-    private final Queue<Consumer<Connection>> pendingActions = Queues.newConcurrentLinkedQueue();
++    private final Queue<WrappedConsumer> pendingActions = Queues.newConcurrentLinkedQueue();
+     public Channel channel;
+     public SocketAddress address;
+     // Spigot Start
+@@ -116,6 +116,10 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+     public java.net.InetSocketAddress virtualHost;
+     private static boolean enableExplicitFlush = Boolean.getBoolean("paper.explicit-flush");
+     // Paper end
++    // Paper start - Optimize network
++    public boolean isPending = true;
++    public boolean queueImmunity;
++    // Paper end - Optimize network
+ 
+     // Paper start - add utility methods
+     public final net.minecraft.server.level.ServerPlayer getPlayer() {
+@@ -307,15 +311,39 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+     }
+ 
+     public void send(Packet<?> packet, @Nullable PacketSendListener callbacks, boolean flush) {
+-        if (this.isConnected()) {
+-            this.flushQueue();
++        // Paper start - Optimize network: Handle oversized packets better
++        final boolean connected = this.isConnected();
++        if (!connected && !this.preparing) {
++            return;
++        }
++
++        packet.onPacketDispatch(this.getPlayer());
++        if (connected && (InnerUtil.canSendImmediate(this, packet)
++            || (io.papermc.paper.util.MCUtil.isMainThread() && packet.isReady() && this.pendingActions.isEmpty()
++            && (packet.getExtraPackets() == null || packet.getExtraPackets().isEmpty())))) {
+             this.sendPacket(packet, callbacks, flush);
+         } else {
+-            this.pendingActions.add((networkmanager) -> {
+-                networkmanager.sendPacket(packet, callbacks, flush);
+-            });
+-        }
++            // Write the packets to the queue, then flush - antixray hooks there already
++            final java.util.List<Packet<?>> extraPackets = InnerUtil.buildExtraPackets(packet);
++            final boolean hasExtraPackets = extraPackets != null && !extraPackets.isEmpty();
++            if (!hasExtraPackets) {
++                this.pendingActions.add(new PacketSendAction(packet, callbacks, flush));
++            } else {
++                final java.util.List<PacketSendAction> actions = new java.util.ArrayList<>(1 + extraPackets.size());
++                actions.add(new PacketSendAction(packet, null, false)); // Delay the future listener until the end of the extra packets
+ 
++                for (int i = 0, len = extraPackets.size(); i < len;) {
++                    final Packet<?> extraPacket = extraPackets.get(i);
++                    final boolean end = ++i == len;
++                    actions.add(new PacketSendAction(extraPacket, end ? callbacks : null, end)); // Append listener to the end
++                }
++
++                this.pendingActions.addAll(actions);
++            }
++
++            this.flushQueue();
++            // Paper end - Optimize network
++        }
+     }
+ 
+     public void runOnceConnected(Consumer<Connection> task) {
+@@ -323,7 +351,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+             this.flushQueue();
+             task.accept(this);
+         } else {
+-            this.pendingActions.add(task);
++            this.pendingActions.add(new WrappedConsumer(task)); // Paper - Optimize network
+         }
+ 
+     }
+@@ -341,6 +369,14 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+     }
+ 
+     private void doSendPacket(Packet<?> packet, @Nullable PacketSendListener callbacks, boolean flush) {
++        // Paper start - Optimize network
++        final net.minecraft.server.level.ServerPlayer player = this.getPlayer();
++        if (!this.isConnected()) {
++            packet.onPacketDispatchFinish(player, null);
++            return;
++        }
++        try {
++        // Paper end - Optimize network
+         ChannelFuture channelfuture = flush ? this.channel.writeAndFlush(packet) : this.channel.write(packet);
+ 
+         if (callbacks != null) {
+@@ -360,14 +396,24 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+             });
+         }
+ 
++        // Paper start - Optimize network
++        if (packet.hasFinishListener()) {
++            channelfuture.addListener((ChannelFutureListener) channelFuture -> packet.onPacketDispatchFinish(player, channelFuture));
++        }
+         channelfuture.addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
++        } catch (final Exception e) {
++            LOGGER.error("NetworkException: {}", player, e);
++            this.disconnect(Component.translatable("disconnect.genericReason", "Internal Exception: " + e.getMessage()));
++            packet.onPacketDispatchFinish(player, null);
++        }
++        // Paper end - Optimize network
+     }
+ 
+     public void flushChannel() {
+         if (this.isConnected()) {
+             this.flush();
+         } else {
+-            this.pendingActions.add(Connection::flush);
++            this.pendingActions.add(new WrappedConsumer(Connection::flush)); // Paper - Optimize network
+         }
+ 
+     }
+@@ -400,20 +446,57 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+         return attributekey;
+     }
+ 
+-    private void flushQueue() {
+-        if (this.channel != null && this.channel.isOpen()) {
+-            Queue queue = this.pendingActions;
+-
++    // Paper start - Optimize network: Rewrite this to be safer if ran off main thread
++    private boolean flushQueue() {
++        if (!this.isConnected()) {
++            return true;
++        }
++        if (io.papermc.paper.util.MCUtil.isMainThread()) {
++            return this.processQueue();
++        } else if (this.isPending) {
++            // Should only happen during login/status stages
+             synchronized (this.pendingActions) {
+-                Consumer consumer;
++                return this.processQueue();
++            }
++        }
++        return false;
++    }
++
++    private boolean processQueue() {
++        if (this.pendingActions.isEmpty()) {
++            return true;
++        }
+ 
+-                while ((consumer = (Consumer) this.pendingActions.poll()) != null) {
+-                    consumer.accept(this);
++        // If we are on main, we are safe here in that nothing else should be processing queue off main anymore
++        // But if we are not on main due to login/status, the parent is synchronized on packetQueue
++        final java.util.Iterator<WrappedConsumer> iterator = this.pendingActions.iterator();
++        while (iterator.hasNext()) {
++            final WrappedConsumer queued = iterator.next(); // poll -> peek
++
++            // Fix NPE (Spigot bug caused by handleDisconnection())
++            if (queued == null) {
++                return true;
++            }
++
++            if (queued.isConsumed()) {
++                continue;
++            }
++
++            if (queued instanceof PacketSendAction packetSendAction) {
++                final Packet<?> packet = packetSendAction.packet;
++                if (!packet.isReady()) {
++                    return false;
+                 }
++            }
+ 
++            iterator.remove();
++            if (queued.tryMarkConsumed()) {
++                queued.accept(this);
+             }
+         }
++        return true;
+     }
++    // Paper end - Optimize network
+ 
+     public void tick() {
+         this.flushQueue();
+@@ -461,6 +544,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+     public void disconnect(Component disconnectReason) {
+         // Spigot Start
+         this.preparing = false;
++        this.clearPacketQueue(); // Paper - Optimize network
+         // Spigot End
+         if (this.channel == null) {
+             this.delayedDisconnect = disconnectReason;
+@@ -630,7 +714,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+     public void handleDisconnection() {
+         if (this.channel != null && !this.channel.isOpen()) {
+             if (this.disconnectionHandled) {
+-                Connection.LOGGER.warn("handleDisconnection() called twice");
++                // Connection.LOGGER.warn("handleDisconnection() called twice"); // Paper - Don't log useless message
+             } else {
+                 this.disconnectionHandled = true;
+                 PacketListener packetlistener = this.getPacketListener();
+@@ -643,7 +727,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+ 
+                     packetlistener1.onDisconnect(ichatbasecomponent);
+                 }
+-                this.pendingActions.clear(); // Free up packet queue.
++                this.clearPacketQueue(); // Paper - Optimize network
+                 // Paper start - Add PlayerConnectionCloseEvent
+                 final PacketListener packetListener = this.getPacketListener();
+                 if (packetListener instanceof net.minecraft.server.network.ServerGamePacketListenerImpl) {
+@@ -681,4 +765,89 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+     public void setBandwidthLogger(SampleLogger log) {
+         this.bandwidthDebugMonitor = new BandwidthDebugMonitor(log);
+     }
++
++    // Paper start - Optimize network
++    public void clearPacketQueue() {
++        final net.minecraft.server.level.ServerPlayer player = getPlayer();
++        for (final Consumer<Connection> queuedAction : this.pendingActions) {
++            if (queuedAction instanceof PacketSendAction packetSendAction) {
++                final Packet<?> packet = packetSendAction.packet;
++                if (packet.hasFinishListener()) {
++                    packet.onPacketDispatchFinish(player, null);
++                }
++            }
++        }
++        this.pendingActions.clear();
++    }
++
++    private static class InnerUtil { // Attempt to hide these methods from ProtocolLib, so it doesn't accidently pick them up.
++
++        @Nullable
++        private static java.util.List<Packet<?>> buildExtraPackets(final Packet<?> packet) {
++            final java.util.List<Packet<?>> extra = packet.getExtraPackets();
++            if (extra == null || extra.isEmpty()) {
++                return null;
++            }
++
++            final java.util.List<Packet<?>> ret = new java.util.ArrayList<>(1 + extra.size());
++            buildExtraPackets0(extra, ret);
++            return ret;
++        }
++
++        private static void buildExtraPackets0(final java.util.List<Packet<?>> extraPackets, final java.util.List<Packet<?>> into) {
++            for (final Packet<?> extra : extraPackets) {
++                into.add(extra);
++                final java.util.List<Packet<?>> extraExtra = extra.getExtraPackets();
++                if (extraExtra != null && !extraExtra.isEmpty()) {
++                    buildExtraPackets0(extraExtra, into);
++                }
++            }
++        }
++
++        private static boolean canSendImmediate(final Connection networkManager, final net.minecraft.network.protocol.Packet<?> packet) {
++            return networkManager.isPending || networkManager.packetListener.protocol() != ConnectionProtocol.PLAY ||
++                packet instanceof net.minecraft.network.protocol.common.ClientboundKeepAlivePacket ||
++                packet instanceof net.minecraft.network.protocol.game.ClientboundPlayerChatPacket ||
++                packet instanceof net.minecraft.network.protocol.game.ClientboundSystemChatPacket ||
++                packet instanceof net.minecraft.network.protocol.game.ClientboundCommandSuggestionsPacket ||
++                packet instanceof net.minecraft.network.protocol.game.ClientboundSetTitleTextPacket ||
++                packet instanceof net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket ||
++                packet instanceof net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket ||
++                packet instanceof net.minecraft.network.protocol.game.ClientboundSetTitlesAnimationPacket ||
++                packet instanceof net.minecraft.network.protocol.game.ClientboundClearTitlesPacket ||
++                packet instanceof net.minecraft.network.protocol.game.ClientboundBossEventPacket;
++        }
++    }
++
++    private static class WrappedConsumer implements Consumer<Connection> {
++        private final Consumer<Connection> delegate;
++        private final java.util.concurrent.atomic.AtomicBoolean consumed = new java.util.concurrent.atomic.AtomicBoolean(false);
++
++        private WrappedConsumer(final Consumer<Connection> delegate) {
++            this.delegate = delegate;
++        }
++
++        @Override
++        public void accept(final Connection connection) {
++            this.delegate.accept(connection);
++        }
++
++        public boolean tryMarkConsumed() {
++            return consumed.compareAndSet(false, true);
++        }
++
++        public boolean isConsumed() {
++            return consumed.get();
++        }
++    }
++
++    private static final class PacketSendAction extends WrappedConsumer {
++        private final Packet<?> packet;
++
++        private PacketSendAction(final Packet<?> packet, @Nullable final PacketSendListener packetSendListener, final boolean flush) {
++            super(connection -> connection.sendPacket(packet, packetSendListener, flush));
++            this.packet = packet;
++        }
++    }
++    // Paper end - Optimize network
+ }
+diff --git a/src/main/java/net/minecraft/network/protocol/Packet.java b/src/main/java/net/minecraft/network/protocol/Packet.java
+index cc658a61065d5c0021a4b88fa58b40211b94f8ec..da11266a0a23f446196e6facf2c358cfcc18070f 100644
+--- a/src/main/java/net/minecraft/network/protocol/Packet.java
++++ b/src/main/java/net/minecraft/network/protocol/Packet.java
+@@ -11,6 +11,30 @@ public interface Packet<T extends PacketListener> {
+     void handle(T listener);
+ 
+     // Paper start
++    /**
++     * @param player Null if not at PLAY stage yet
++     */
++    default void onPacketDispatch(@Nullable net.minecraft.server.level.ServerPlayer player) {
++    }
++
++    /**
++     * @param player Null if not at PLAY stage yet
++     * @param future Can be null if packet was cancelled
++     */
++    default void onPacketDispatchFinish(@Nullable net.minecraft.server.level.ServerPlayer player, @Nullable io.netty.channel.ChannelFuture future) {}
++
++    default boolean hasFinishListener() {
++        return false;
++    }
++
++    default boolean isReady() {
++        return true;
++    }
++
++    @Nullable
++    default java.util.List<Packet<?>> getExtraPackets() {
++        return null;
++    }
+     default boolean packetTooLarge(net.minecraft.network.Connection manager) {
+         return false;
+     }
+diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
+index d870fbec236a3660f12e0f45cf9431067b18468b..caeead6c6082855f1651ee28263cc9f60423ca0c 100644
+--- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
++++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
+@@ -63,10 +63,12 @@ public class ServerConnectionListener {
+     final List<Connection> connections = Collections.synchronizedList(Lists.newArrayList());
+     // Paper start - prevent blocking on adding a new network manager while the server is ticking
+     private final java.util.Queue<Connection> pending = new java.util.concurrent.ConcurrentLinkedQueue<>();
++    private static final boolean disableFlushConsolidation = Boolean.getBoolean("Paper.disableFlushConsolidate"); // Paper - Optimize network
+     private final void addPending() {
+         Connection manager = null;
+         while ((manager = pending.poll()) != null) {
+             connections.add(manager);
++            manager.isPending = false; // Paper - Optimize network
+         }
+     }
+     // Paper end
+@@ -103,6 +105,7 @@ public class ServerConnectionListener {
+                         ;
+                     }
+ 
++                    if (!disableFlushConsolidation) channel.pipeline().addFirst(new io.netty.handler.flush.FlushConsolidationHandler()); // Paper - Optimize network
+                     ChannelPipeline channelpipeline = channel.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new LegacyQueryHandler(ServerConnectionListener.this.getServer()));
+ 
+                     Connection.configureSerialization(channelpipeline, PacketFlow.SERVERBOUND, (BandwidthDebugMonitor) null);
diff --git a/patches/server/0300-Fire-event-on-GS4-query.patch b/patches/server/0301-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0300-Fire-event-on-GS4-query.patch
rename to patches/server/0301-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0301-Implement-PlayerPostRespawnEvent.patch b/patches/server/0302-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/server/0301-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0302-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0302-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0302-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0303-Server-Tick-Events.patch b/patches/server/0304-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0303-Server-Tick-Events.patch
rename to patches/server/0304-Server-Tick-Events.patch
diff --git a/patches/server/0304-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/server/0304-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0305-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from patches/server/0305-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0306-Add-Heightmap-API.patch b/patches/server/0307-Add-Heightmap-API.patch
similarity index 100%
rename from patches/server/0306-Add-Heightmap-API.patch
rename to patches/server/0307-Add-Heightmap-API.patch
diff --git a/patches/server/0307-Mob-Spawner-API-Enhancements.patch b/patches/server/0308-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0307-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0308-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0308-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from patches/server/0308-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0309-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0309-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0310-Implement-CraftBlockSoundGroup.patch b/patches/server/0311-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0310-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0311-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 100%
rename from patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/patches/server/0312-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0312-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0313-Expose-the-internal-current-tick.patch b/patches/server/0314-Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/server/0313-Expose-the-internal-current-tick.patch
rename to patches/server/0314-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0314-Fix-World-isChunkGenerated-calls.patch b/patches/server/0315-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/server/0314-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0315-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0315-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0315-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0316-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0316-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0317-Configurable-projectile-relative-velocity.patch b/patches/server/0318-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0317-Configurable-projectile-relative-velocity.patch
rename to patches/server/0318-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0318-offset-item-frame-ticking.patch b/patches/server/0319-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0318-offset-item-frame-ticking.patch
rename to patches/server/0319-offset-item-frame-ticking.patch
diff --git a/patches/server/0319-Fix-MC-158900.patch b/patches/server/0320-Fix-MC-158900.patch
similarity index 100%
rename from patches/server/0319-Fix-MC-158900.patch
rename to patches/server/0320-Fix-MC-158900.patch
diff --git a/patches/server/0320-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/server/0320-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0321-Dont-send-unnecessary-sign-update.patch b/patches/server/0322-Dont-send-unnecessary-sign-update.patch
similarity index 100%
rename from patches/server/0321-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0322-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0322-Add-option-to-disable-pillager-patrols.patch b/patches/server/0323-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0322-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0323-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0323-Flat-bedrock-generator-settings.patch b/patches/server/0324-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0323-Flat-bedrock-generator-settings.patch
rename to patches/server/0324-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0324-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0324-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0325-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0325-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0326-Duplicate-UUID-Resolve-Option.patch b/patches/server/0327-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0326-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0327-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0327-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/server/0327-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0328-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0328-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0329-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0329-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch
similarity index 100%
rename from patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch
rename to patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/server/0331-Fix-items-not-falling-correctly.patch b/patches/server/0332-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/0331-Fix-items-not-falling-correctly.patch
rename to patches/server/0332-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0332-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0332-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0333-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0333-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0334-Entity-Activation-Range-2.0.patch b/patches/server/0335-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from patches/server/0334-Entity-Activation-Range-2.0.patch
rename to patches/server/0335-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0336-Implement-alternative-item-despawn-rate.patch b/patches/server/0337-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0336-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0337-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0337-Lag-compensate-eating.patch b/patches/server/0338-Lag-compensate-eating.patch
similarity index 100%
rename from patches/server/0337-Lag-compensate-eating.patch
rename to patches/server/0338-Lag-compensate-eating.patch
diff --git a/patches/server/0338-Tracking-Range-Improvements.patch b/patches/server/0339-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0338-Tracking-Range-Improvements.patch
rename to patches/server/0339-Tracking-Range-Improvements.patch
diff --git a/patches/server/0339-Fix-items-vanishing-through-end-portal.patch b/patches/server/0340-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from patches/server/0339-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0340-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0340-implement-optional-per-player-mob-spawns.patch b/patches/server/0341-implement-optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/0340-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0341-implement-optional-per-player-mob-spawns.patch
diff --git a/patches/server/0341-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0342-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0341-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0342-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0342-Improve-Block-breakNaturally-API.patch b/patches/server/0343-Improve-Block-breakNaturally-API.patch
similarity index 100%
rename from patches/server/0342-Improve-Block-breakNaturally-API.patch
rename to patches/server/0343-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0344-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0344-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0344-Add-debug-for-sync-chunk-loads.patch b/patches/server/0345-Add-debug-for-sync-chunk-loads.patch
similarity index 100%
rename from patches/server/0344-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0345-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0345-Improve-java-version-check.patch b/patches/server/0346-Improve-java-version-check.patch
similarity index 100%
rename from patches/server/0345-Improve-java-version-check.patch
rename to patches/server/0346-Improve-java-version-check.patch
diff --git a/patches/server/0346-Add-ThrownEggHatchEvent.patch b/patches/server/0347-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0346-Add-ThrownEggHatchEvent.patch
rename to patches/server/0347-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0347-Entity-Jump-API.patch b/patches/server/0348-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0347-Entity-Jump-API.patch
rename to patches/server/0348-Entity-Jump-API.patch
diff --git a/patches/server/0348-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0349-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/0348-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0349-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0349-Make-the-GUI-graph-fancier.patch b/patches/server/0350-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0349-Make-the-GUI-graph-fancier.patch
rename to patches/server/0350-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0350-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0351-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0350-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0351-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0351-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0352-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0351-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0352-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0352-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0353-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0352-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0353-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0353-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0354-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0353-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0354-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0354-Optimise-Chunk-getFluid.patch b/patches/server/0355-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0354-Optimise-Chunk-getFluid.patch
rename to patches/server/0355-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0355-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0356-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0355-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0356-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0356-Add-tick-times-API-and-mspt-command.patch b/patches/server/0357-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from patches/server/0356-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0357-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0357-Expose-MinecraftServer-isRunning.patch b/patches/server/0358-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/0357-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0358-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0358-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0359-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0358-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0359-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0359-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0360-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0359-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0360-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0360-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0361-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0360-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0361-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0361-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0362-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0361-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0362-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0363-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from patches/server/0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0363-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0363-Don-t-tick-dead-players.patch b/patches/server/0364-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0363-Don-t-tick-dead-players.patch
rename to patches/server/0364-Don-t-tick-dead-players.patch
diff --git a/patches/server/0364-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0365-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0364-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0365-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0365-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0366-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/0365-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0366-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0367-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0367-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0367-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0368-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0367-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0368-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0368-Improved-Watchdog-Support.patch b/patches/server/0369-Improved-Watchdog-Support.patch
similarity index 100%
rename from patches/server/0368-Improved-Watchdog-Support.patch
rename to patches/server/0369-Improved-Watchdog-Support.patch
diff --git a/patches/server/0369-Optimize-Pathfinding.patch b/patches/server/0370-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0369-Optimize-Pathfinding.patch
rename to patches/server/0370-Optimize-Pathfinding.patch
diff --git a/patches/server/0370-Reduce-Either-Optional-allocation.patch b/patches/server/0371-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0370-Reduce-Either-Optional-allocation.patch
rename to patches/server/0371-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0371-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0372-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0371-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0372-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0372-Prevent-opening-inventories-when-frozen.patch b/patches/server/0373-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0372-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0373-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0373-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0374-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0373-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0374-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0374-Implement-Player-Client-Options-API.patch b/patches/server/0375-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0374-Implement-Player-Client-Options-API.patch
rename to patches/server/0375-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0375-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0376-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0375-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0376-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0377-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0377-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0378-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0378-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0378-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0379-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0378-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0379-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0379-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0380-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0379-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0380-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0380-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0381-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0380-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0381-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0382-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0382-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0382-Villager-Restocks-API.patch b/patches/server/0383-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0382-Villager-Restocks-API.patch
rename to patches/server/0383-Villager-Restocks-API.patch
diff --git a/patches/server/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0384-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0384-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0384-Expose-game-version.patch b/patches/server/0385-Expose-game-version.patch
similarity index 100%
rename from patches/server/0384-Expose-game-version.patch
rename to patches/server/0385-Expose-game-version.patch
diff --git a/patches/server/0385-Optimize-Voxel-Shape-Merging.patch b/patches/server/0386-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0385-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0386-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0386-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0387-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0386-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0387-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0387-misc-debugging-dumps.patch b/patches/server/0388-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0387-misc-debugging-dumps.patch
rename to patches/server/0388-misc-debugging-dumps.patch
diff --git a/patches/server/0388-Prevent-teleporting-dead-entities.patch b/patches/server/0389-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/0388-Prevent-teleporting-dead-entities.patch
rename to patches/server/0389-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0390-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 99%
rename from patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0390-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 62508b487a..1bc586732d 100644
--- a/patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0390-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -494,7 +494,7 @@ index 52eb3176437113f9a0ff85d10ce5c2415e1b5570..b54ddd0ba0b001fbcb1838a838ca4890
          }
      }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 9f8fbb8231b60c287c9442365c2f95cde92969b8..4f33d7369c95f4d2afdef1cc333a7713f08d253d 100644
+index d8ae86dcc07872c63064782c9864b873f07139d1..af4ded7a31da34ccebb3cfe9c1eb5d5c918950b1 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -75,13 +75,13 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -513,8 +513,8 @@ index 9f8fbb8231b60c287c9442365c2f95cde92969b8..4f33d7369c95f4d2afdef1cc333a7713
 +        return new DefaultEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Local Client IO #%d").setDaemon(true).setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(LOGGER)).build()); // Paper
      });
      private final PacketFlow receiving;
-     private final Queue<Consumer<Connection>> pendingActions = Queues.newConcurrentLinkedQueue();
-@@ -207,7 +207,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+     private final Queue<WrappedConsumer> pendingActions = Queues.newConcurrentLinkedQueue();
+@@ -211,7 +211,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
  
              }
          }
@@ -573,7 +573,7 @@ index 77e19f345bf68d12686a65e669cd597cd92af910..8dbcc1b3a70b6bbea3bd2d15b6d66cc4
              // Paper end
              this.connection.send(new ClientboundDisconnectPacket(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA));
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index d870fbec236a3660f12e0f45cf9431067b18468b..c98d3c5afcce17a6f13f8d456b9f77b1f2a4f3f0 100644
+index caeead6c6082855f1651ee28263cc9f60423ca0c..b2bfb3893200362ac35ae60982f203f86a1148ec 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -52,10 +52,10 @@ public class ServerConnectionListener {
diff --git a/patches/server/0390-Implement-Mob-Goal-API.patch b/patches/server/0391-Implement-Mob-Goal-API.patch
similarity index 100%
rename from patches/server/0390-Implement-Mob-Goal-API.patch
rename to patches/server/0391-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0391-Add-villager-reputation-API.patch b/patches/server/0392-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0391-Add-villager-reputation-API.patch
rename to patches/server/0392-Add-villager-reputation-API.patch
diff --git a/patches/server/0392-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0393-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0392-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0393-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0393-ExperienceOrbMergeEvent.patch b/patches/server/0394-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0393-ExperienceOrbMergeEvent.patch
rename to patches/server/0394-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0394-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0395-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0394-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0395-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0395-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0396-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0395-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0396-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0396-Potential-bed-API.patch b/patches/server/0397-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0396-Potential-bed-API.patch
rename to patches/server/0397-Potential-bed-API.patch
diff --git a/patches/server/0397-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0398-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/0397-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0398-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0398-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0399-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0398-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0399-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0400-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from patches/server/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0400-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0400-Ensure-safe-gateway-teleport.patch b/patches/server/0401-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0400-Ensure-safe-gateway-teleport.patch
rename to patches/server/0401-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0401-Add-option-for-console-having-all-permissions.patch b/patches/server/0402-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0401-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0402-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0402-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0403-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0402-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0403-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0403-Maps-shouldn-t-load-chunks.patch b/patches/server/0404-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0403-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0404-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0404-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0405-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0404-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0405-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0405-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0406-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0405-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0406-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0406-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0407-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0406-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0407-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0407-Fix-sand-duping.patch b/patches/server/0408-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0407-Fix-sand-duping.patch
rename to patches/server/0408-Fix-sand-duping.patch
diff --git a/patches/server/0408-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0409-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0408-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0409-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0409-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0410-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from patches/server/0409-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0410-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0410-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0411-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0410-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0411-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0411-Improve-Arrow-API.patch b/patches/server/0412-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0411-Improve-Arrow-API.patch
rename to patches/server/0412-Improve-Arrow-API.patch
diff --git a/patches/server/0412-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0413-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0412-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0413-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0413-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0414-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0413-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0414-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0414-Add-permission-for-command-blocks.patch b/patches/server/0415-Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/0414-Add-permission-for-command-blocks.patch
rename to patches/server/0415-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0415-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0415-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0417-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0417-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0417-Paper-dumpitem-command.patch b/patches/server/0418-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0417-Paper-dumpitem-command.patch
rename to patches/server/0418-Paper-dumpitem-command.patch
diff --git a/patches/server/0418-Improve-Legacy-Component-serialization-size.patch b/patches/server/0419-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0418-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0419-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0419-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0420-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0419-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0420-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0421-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0421-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0421-incremental-chunk-and-player-saving.patch b/patches/server/0422-incremental-chunk-and-player-saving.patch
similarity index 100%
rename from patches/server/0421-incremental-chunk-and-player-saving.patch
rename to patches/server/0422-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0422-Support-old-UUID-format-for-NBT.patch b/patches/server/0423-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0422-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0423-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0423-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0423-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0424-Remove-some-streams-from-structures.patch b/patches/server/0425-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0424-Remove-some-streams-from-structures.patch
rename to patches/server/0425-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0425-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0426-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0425-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0426-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0426-Support-components-in-ItemMeta.patch b/patches/server/0427-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0426-Support-components-in-ItemMeta.patch
rename to patches/server/0427-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0427-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0428-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0427-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0428-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0428-Add-entity-liquid-API.patch b/patches/server/0429-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0428-Add-entity-liquid-API.patch
rename to patches/server/0429-Add-entity-liquid-API.patch
diff --git a/patches/server/0429-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0430-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0429-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0430-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0430-Spawn-player-in-correct-world-on-login.patch b/patches/server/0431-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0430-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0431-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0431-Add-PrepareResultEvent.patch b/patches/server/0432-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0431-Add-PrepareResultEvent.patch
rename to patches/server/0432-Add-PrepareResultEvent.patch
diff --git a/patches/server/0432-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0432-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0433-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0434-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0433-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0434-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0434-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0435-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0434-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0435-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0435-Fix-SPIGOT-5989.patch b/patches/server/0436-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0435-Fix-SPIGOT-5989.patch
rename to patches/server/0436-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0436-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0437-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0436-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0437-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0437-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0438-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0437-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0438-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0438-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0439-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0438-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0439-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0439-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0440-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0439-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0440-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0440-Fix-some-rails-connecting-improperly.patch b/patches/server/0441-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0440-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0441-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0441-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0441-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0442-Brand-support.patch b/patches/server/0443-Brand-support.patch
similarity index 100%
rename from patches/server/0442-Brand-support.patch
rename to patches/server/0443-Brand-support.patch
diff --git a/patches/server/0443-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0444-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0443-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0444-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0444-Don-t-require-FACING-data.patch b/patches/server/0445-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0444-Don-t-require-FACING-data.patch
rename to patches/server/0445-Don-t-require-FACING-data.patch
diff --git a/patches/server/0445-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0446-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0445-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0446-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0446-Add-moon-phase-API.patch b/patches/server/0447-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0446-Add-moon-phase-API.patch
rename to patches/server/0447-Add-moon-phase-API.patch
diff --git a/patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0448-Prevent-headless-pistons-from-being-created.patch b/patches/server/0449-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0448-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0449-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0449-Add-BellRingEvent.patch b/patches/server/0450-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0449-Add-BellRingEvent.patch
rename to patches/server/0450-Add-BellRingEvent.patch
diff --git a/patches/server/0450-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0451-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0450-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0451-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0451-Buffer-joins-to-world.patch b/patches/server/0452-Buffer-joins-to-world.patch
similarity index 91%
rename from patches/server/0451-Buffer-joins-to-world.patch
rename to patches/server/0452-Buffer-joins-to-world.patch
index 7f558aaa66..4a45ac3b97 100644
--- a/patches/server/0451-Buffer-joins-to-world.patch
+++ b/patches/server/0452-Buffer-joins-to-world.patch
@@ -8,12 +8,12 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 4f33d7369c95f4d2afdef1cc333a7713f08d253d..039c99078150d9732cfad7edc5baba11e1e3d010 100644
+index af4ded7a31da34ccebb3cfe9c1eb5d5c918950b1..b9d1eefb2afbf24bdc902c6dea06e911e835d698 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -415,14 +415,29 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-         }
+@@ -498,14 +498,29 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      }
+     // Paper end - Optimize network
  
 +    private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper
 +    private static int joinAttemptsThisTick; // Paper
diff --git a/patches/server/0452-Eigencraft-redstone-implementation.patch b/patches/server/0453-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0452-Eigencraft-redstone-implementation.patch
rename to patches/server/0453-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0453-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0454-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0453-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0454-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0454-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0455-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0454-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0455-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0455-Add-more-Evoker-API.patch b/patches/server/0456-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0455-Add-more-Evoker-API.patch
rename to patches/server/0456-Add-more-Evoker-API.patch
diff --git a/patches/server/0456-Add-methods-to-get-translation-keys.patch b/patches/server/0457-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0456-Add-methods-to-get-translation-keys.patch
rename to patches/server/0457-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0457-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0458-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0457-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0458-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0458-Cache-block-data-strings.patch b/patches/server/0459-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0458-Cache-block-data-strings.patch
rename to patches/server/0459-Cache-block-data-strings.patch
diff --git a/patches/server/0459-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0460-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0459-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0460-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0460-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0461-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0460-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0461-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0461-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0462-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0461-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0462-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0462-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0463-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0462-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0463-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0463-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0464-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0463-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0464-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0464-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0465-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0464-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0465-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0465-Entity-isTicking.patch b/patches/server/0466-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0465-Entity-isTicking.patch
rename to patches/server/0466-Entity-isTicking.patch
diff --git a/patches/server/0466-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0467-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0466-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0467-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0467-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0468-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0467-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0468-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0468-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0469-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0468-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0469-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0469-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0470-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0469-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0470-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0470-Optimise-getType-calls.patch b/patches/server/0471-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0470-Optimise-getType-calls.patch
rename to patches/server/0471-Optimise-getType-calls.patch
diff --git a/patches/server/0471-Villager-resetOffers.patch b/patches/server/0472-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0471-Villager-resetOffers.patch
rename to patches/server/0472-Villager-resetOffers.patch
diff --git a/patches/server/0472-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0473-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0472-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0473-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0473-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0474-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0473-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0474-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0474-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0475-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0474-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0475-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0475-Player-elytra-boost-API.patch b/patches/server/0476-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0475-Player-elytra-boost-API.patch
rename to patches/server/0476-Player-elytra-boost-API.patch
diff --git a/patches/server/0476-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0477-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0476-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0477-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0477-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0478-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0477-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0478-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0478-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0479-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0478-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0479-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0479-Add-ignore-discounts-API.patch b/patches/server/0480-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0479-Add-ignore-discounts-API.patch
rename to patches/server/0480-Add-ignore-discounts-API.patch
diff --git a/patches/server/0480-Toggle-for-removing-existing-dragon.patch b/patches/server/0481-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0480-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0481-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0481-Fix-client-lag-on-advancement-loading.patch b/patches/server/0482-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0481-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0482-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0482-Item-no-age-no-player-pickup.patch b/patches/server/0483-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0482-Item-no-age-no-player-pickup.patch
rename to patches/server/0483-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0483-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0484-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0483-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0484-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0484-Beacon-API-custom-effect-ranges.patch b/patches/server/0485-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0484-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0485-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0485-Add-API-for-quit-reason.patch b/patches/server/0486-Add-API-for-quit-reason.patch
similarity index 97%
rename from patches/server/0485-Add-API-for-quit-reason.patch
rename to patches/server/0486-Add-API-for-quit-reason.patch
index 3e57a99293..aaf4aab245 100644
--- a/patches/server/0485-Add-API-for-quit-reason.patch
+++ b/patches/server/0486-Add-API-for-quit-reason.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add API for quit reason
 
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 039c99078150d9732cfad7edc5baba11e1e3d010..2859f5bf5a00ff6841933dd83135d89a1786e76e 100644
+index b9d1eefb2afbf24bdc902c6dea06e911e835d698..4f5216cb3ac323de1a79c2b9c4d2ddd7c4875138 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -179,12 +179,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -183,12 +183,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
  
              this.handlingFault = true;
              if (this.channel.isOpen()) {
diff --git a/patches/server/0486-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0487-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0486-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0487-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0487-Expose-world-spawn-angle.patch b/patches/server/0488-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0487-Expose-world-spawn-angle.patch
rename to patches/server/0488-Expose-world-spawn-angle.patch
diff --git a/patches/server/0488-Add-Destroy-Speed-API.patch b/patches/server/0489-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0488-Add-Destroy-Speed-API.patch
rename to patches/server/0489-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0489-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0489-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0490-Add-LivingEntity-clearActiveItem.patch b/patches/server/0491-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0490-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0491-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0491-Add-PlayerItemCooldownEvent.patch b/patches/server/0492-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0491-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0492-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0492-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0493-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0492-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0493-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0493-More-lightning-API.patch b/patches/server/0494-More-lightning-API.patch
similarity index 100%
rename from patches/server/0493-More-lightning-API.patch
rename to patches/server/0494-More-lightning-API.patch
diff --git a/patches/server/0494-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0494-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0495-Added-missing-default-perms-for-commands.patch b/patches/server/0496-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0495-Added-missing-default-perms-for-commands.patch
rename to patches/server/0496-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0496-Add-PlayerShearBlockEvent.patch b/patches/server/0497-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0496-Add-PlayerShearBlockEvent.patch
rename to patches/server/0497-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0497-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0498-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0497-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0498-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0498-Limit-recipe-packets.patch b/patches/server/0499-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0498-Limit-recipe-packets.patch
rename to patches/server/0499-Limit-recipe-packets.patch
diff --git a/patches/server/0499-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0500-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0499-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0500-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0500-Player-Chunk-Load-Unload-Events.patch b/patches/server/0501-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0500-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0501-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0501-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0502-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0501-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0502-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0502-Expose-LivingEntity-hurt-direction.patch b/patches/server/0503-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0502-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0503-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0503-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0504-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0503-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0504-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0504-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0505-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0504-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0505-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0505-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0506-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0505-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0506-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0506-Implement-TargetHitEvent.patch b/patches/server/0507-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0506-Implement-TargetHitEvent.patch
rename to patches/server/0507-Implement-TargetHitEvent.patch
diff --git a/patches/server/0507-MC-4-Fix-item-position-desync.patch b/patches/server/0508-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0507-MC-4-Fix-item-position-desync.patch
rename to patches/server/0508-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0508-Additional-Block-Material-API-s.patch b/patches/server/0509-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0508-Additional-Block-Material-API-s.patch
rename to patches/server/0509-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0509-Fix-harming-potion-dupe.patch b/patches/server/0510-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0509-Fix-harming-potion-dupe.patch
rename to patches/server/0510-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0510-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0510-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0511-Cache-burn-durations.patch b/patches/server/0512-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0511-Cache-burn-durations.patch
rename to patches/server/0512-Cache-burn-durations.patch
diff --git a/patches/server/0512-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0513-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0512-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0513-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0513-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0514-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0513-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0514-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0514-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0515-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0514-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0515-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0515-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0516-Fix-interact-event-not-being-called-sometimes.patch
similarity index 100%
rename from patches/server/0515-Fix-interact-event-not-being-called-sometimes.patch
rename to patches/server/0516-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0516-Zombie-API-breaking-doors.patch b/patches/server/0517-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0516-Zombie-API-breaking-doors.patch
rename to patches/server/0517-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0517-Fix-nerfed-slime-when-splitting.patch b/patches/server/0518-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0517-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0518-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0518-Add-EntityLoadCrossbowEvent.patch b/patches/server/0519-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0518-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0519-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0519-Added-WorldGameRuleChangeEvent.patch b/patches/server/0520-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0519-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0520-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0520-Added-ServerResourcesReloadedEvent.patch b/patches/server/0521-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0520-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0521-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0521-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0522-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0521-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0522-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0522-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0523-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0522-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0523-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0523-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0524-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0523-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0524-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0524-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0525-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0524-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0525-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0525-Configurable-door-breaking-difficulty.patch b/patches/server/0526-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0525-Configurable-door-breaking-difficulty.patch
rename to patches/server/0526-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0526-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0527-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0526-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0527-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0527-Remove-stale-POIs.patch b/patches/server/0528-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0527-Remove-stale-POIs.patch
rename to patches/server/0528-Remove-stale-POIs.patch
diff --git a/patches/server/0528-Fix-villager-boat-exploit.patch b/patches/server/0529-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0528-Fix-villager-boat-exploit.patch
rename to patches/server/0529-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0529-Add-sendOpLevel-API.patch b/patches/server/0530-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0529-Add-sendOpLevel-API.patch
rename to patches/server/0530-Add-sendOpLevel-API.patch
diff --git a/patches/server/0530-TODO-Registry-Modification-API.patch b/patches/server/0531-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0530-TODO-Registry-Modification-API.patch
rename to patches/server/0531-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0531-Add-StructuresLocateEvent.patch b/patches/server/0532-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0531-Add-StructuresLocateEvent.patch
rename to patches/server/0532-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0532-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0533-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0532-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0533-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0534-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0534-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0535-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0535-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0535-Make-schedule-command-per-world.patch b/patches/server/0536-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0535-Make-schedule-command-per-world.patch
rename to patches/server/0536-Make-schedule-command-per-world.patch
diff --git a/patches/server/0536-Configurable-max-leash-distance.patch b/patches/server/0537-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0536-Configurable-max-leash-distance.patch
rename to patches/server/0537-Configurable-max-leash-distance.patch
diff --git a/patches/server/0537-Implement-BlockPreDispenseEvent.patch b/patches/server/0538-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0537-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0538-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0539-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0539-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0540-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0540-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0541-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0541-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0542-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0542-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0542-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0543-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0542-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0543-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0543-add-DragonEggFormEvent.patch b/patches/server/0544-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0543-add-DragonEggFormEvent.patch
rename to patches/server/0544-add-DragonEggFormEvent.patch
diff --git a/patches/server/0544-EntityMoveEvent.patch b/patches/server/0545-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0544-EntityMoveEvent.patch
rename to patches/server/0545-EntityMoveEvent.patch
diff --git a/patches/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0546-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0546-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0546-Inline-shift-direction-fields.patch b/patches/server/0547-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0546-Inline-shift-direction-fields.patch
rename to patches/server/0547-Inline-shift-direction-fields.patch
diff --git a/patches/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0548-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0548-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0549-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0549-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0549-living-entity-allow-attribute-registration.patch b/patches/server/0550-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0549-living-entity-allow-attribute-registration.patch
rename to patches/server/0550-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0550-fix-dead-slime-setSize-invincibility.patch b/patches/server/0551-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0550-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0551-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0552-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0552-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0552-Expose-Tracked-Players.patch b/patches/server/0553-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0552-Expose-Tracked-Players.patch
rename to patches/server/0553-Expose-Tracked-Players.patch
diff --git a/patches/server/0553-Remove-streams-from-SensorNearest.patch b/patches/server/0554-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0553-Remove-streams-from-SensorNearest.patch
rename to patches/server/0554-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0554-Improve-ServerGUI.patch b/patches/server/0555-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0554-Improve-ServerGUI.patch
rename to patches/server/0555-Improve-ServerGUI.patch
diff --git a/patches/server/0555-fix-converting-txt-to-json-file.patch b/patches/server/0556-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0555-fix-converting-txt-to-json-file.patch
rename to patches/server/0556-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0556-Add-worldborder-events.patch b/patches/server/0557-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0556-Add-worldborder-events.patch
rename to patches/server/0557-Add-worldborder-events.patch
diff --git a/patches/server/0557-added-PlayerNameEntityEvent.patch b/patches/server/0558-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0557-added-PlayerNameEntityEvent.patch
rename to patches/server/0558-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0558-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0559-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0558-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0559-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0559-Add-recipe-to-cook-events.patch b/patches/server/0560-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0559-Add-recipe-to-cook-events.patch
rename to patches/server/0560-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0560-Add-Block-isValidTool.patch b/patches/server/0561-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0560-Add-Block-isValidTool.patch
rename to patches/server/0561-Add-Block-isValidTool.patch
diff --git a/patches/server/0561-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0562-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0561-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0562-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0562-Expand-world-key-API.patch b/patches/server/0563-Expand-world-key-API.patch
similarity index 100%
rename from patches/server/0562-Expand-world-key-API.patch
rename to patches/server/0563-Expand-world-key-API.patch
diff --git a/patches/server/0563-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0564-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0563-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0564-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0564-Item-Rarity-API.patch b/patches/server/0565-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0564-Item-Rarity-API.patch
rename to patches/server/0565-Item-Rarity-API.patch
diff --git a/patches/server/0565-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0566-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0565-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0566-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0566-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0567-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0566-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0567-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0568-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0568-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0568-Expose-protocol-version.patch b/patches/server/0569-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0568-Expose-protocol-version.patch
rename to patches/server/0569-Expose-protocol-version.patch
diff --git a/patches/server/0569-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0570-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0569-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0570-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0570-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0570-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0571-Add-bypass-host-check.patch b/patches/server/0572-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0571-Add-bypass-host-check.patch
rename to patches/server/0572-Add-bypass-host-check.patch
diff --git a/patches/server/0572-Set-area-affect-cloud-rotation.patch b/patches/server/0573-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0572-Set-area-affect-cloud-rotation.patch
rename to patches/server/0573-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0573-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0574-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0573-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0574-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0574-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0575-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0574-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0575-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0575-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0576-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0575-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0576-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0576-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0577-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0576-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0577-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0578-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0578-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0578-Added-PlayerDeepSleepEvent.patch b/patches/server/0579-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0578-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0579-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0579-More-World-API.patch b/patches/server/0580-More-World-API.patch
similarity index 100%
rename from patches/server/0579-More-World-API.patch
rename to patches/server/0580-More-World-API.patch
diff --git a/patches/server/0580-Added-PlayerBedFailEnterEvent.patch b/patches/server/0581-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0580-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0581-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0581-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0582-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0581-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0582-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0583-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0583-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0583-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0584-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0583-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0584-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0585-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0585-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0585-Add-Channel-initialization-listeners.patch b/patches/server/0586-Add-Channel-initialization-listeners.patch
similarity index 94%
rename from patches/server/0585-Add-Channel-initialization-listeners.patch
rename to patches/server/0586-Add-Channel-initialization-listeners.patch
index 80eb35fe3e..523704b0e0 100644
--- a/patches/server/0585-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0586-Add-Channel-initialization-listeners.patch
@@ -122,10 +122,10 @@ index 0000000000000000000000000000000000000000..0d7e7db9e37ef0183c32b217bd944fb4
 +    COMPRESSION_DISABLED
 +}
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 2859f5bf5a00ff6841933dd83135d89a1786e76e..1f536fb6f96edb78953abd295096e60272044ac7 100644
+index 4f5216cb3ac323de1a79c2b9c4d2ddd7c4875138..c06473f8c6cb116071e256747bc95c38dd2015a6 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -633,6 +633,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -717,6 +717,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
              } else {
                  this.channel.pipeline().addBefore("encoder", "compress", new CompressionEncoder(compressionThreshold));
              }
@@ -133,7 +133,7 @@ index 2859f5bf5a00ff6841933dd83135d89a1786e76e..1f536fb6f96edb78953abd295096e602
          } else {
              if (this.channel.pipeline().get("decompress") instanceof CompressionDecoder) {
                  this.channel.pipeline().remove("decompress");
-@@ -641,6 +642,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -725,6 +726,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
              if (this.channel.pipeline().get("compress") instanceof CompressionEncoder) {
                  this.channel.pipeline().remove("compress");
              }
@@ -142,10 +142,10 @@ index 2859f5bf5a00ff6841933dd83135d89a1786e76e..1f536fb6f96edb78953abd295096e602
  
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index c98d3c5afcce17a6f13f8d456b9f77b1f2a4f3f0..2ea40a23539898b9c817440aafc91f4b5fd10977 100644
+index b2bfb3893200362ac35ae60982f203f86a1148ec..6641fd04821240b1bbeff1bd8d996a8f2fff8385 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -113,6 +113,7 @@ public class ServerConnectionListener {
+@@ -116,6 +116,7 @@ public class ServerConnectionListener {
                      pending.add(object); // Paper
                      ((Connection) object).configurePacketHandler(channelpipeline);
                      ((Connection) object).setListenerForServerboundHandshake(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
diff --git a/patches/server/0586-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0587-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0586-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0587-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0587-Add-more-WanderingTrader-API.patch b/patches/server/0588-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0587-Add-more-WanderingTrader-API.patch
rename to patches/server/0588-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0588-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0589-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0588-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0589-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0589-Entity-load-save-limit-per-chunk.patch b/patches/server/0590-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0589-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0590-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0590-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0591-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0590-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0591-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0591-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0592-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0591-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0592-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0592-Inventory-close.patch b/patches/server/0593-Inventory-close.patch
similarity index 100%
rename from patches/server/0592-Inventory-close.patch
rename to patches/server/0593-Inventory-close.patch
diff --git a/patches/server/0593-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0593-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0594-Fix-CraftPotionBrewer-cache.patch b/patches/server/0595-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0594-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0595-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0595-Add-basic-Datapack-API.patch b/patches/server/0596-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0595-Add-basic-Datapack-API.patch
rename to patches/server/0596-Add-basic-Datapack-API.patch
diff --git a/patches/server/0596-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0597-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0596-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0597-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0597-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0597-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0598-ItemStack-repair-check-API.patch b/patches/server/0599-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0598-ItemStack-repair-check-API.patch
rename to patches/server/0599-ItemStack-repair-check-API.patch
diff --git a/patches/server/0599-More-Enchantment-API.patch b/patches/server/0600-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0599-More-Enchantment-API.patch
rename to patches/server/0600-More-Enchantment-API.patch
diff --git a/patches/server/0600-Move-range-check-for-block-placing-up.patch b/patches/server/0601-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0600-Move-range-check-for-block-placing-up.patch
rename to patches/server/0601-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0601-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0602-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0601-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0602-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0602-Add-Mob-lookAt-API.patch b/patches/server/0603-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0602-Add-Mob-lookAt-API.patch
rename to patches/server/0603-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0603-Add-Unix-domain-socket-support.patch b/patches/server/0604-Add-Unix-domain-socket-support.patch
similarity index 97%
rename from patches/server/0603-Add-Unix-domain-socket-support.patch
rename to patches/server/0604-Add-Unix-domain-socket-support.patch
index d8f8086f03..d76d9a1bc5 100644
--- a/patches/server/0603-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0604-Add-Unix-domain-socket-support.patch
@@ -53,10 +53,10 @@ index f598c87dac7a2f852eb8a3948b5ba1a299e85492..b9a4447e790f34fd8f88f353bf0e24a1
              DedicatedServer.LOGGER.warn("**** FAILED TO BIND TO PORT!");
              DedicatedServer.LOGGER.warn("The exception was: {}", ioexception.toString());
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 2ea40a23539898b9c817440aafc91f4b5fd10977..2e7540b0e100347cd91624c9d61a5c4688a52b26 100644
+index 6641fd04821240b1bbeff1bd8d996a8f2fff8385..5f625acf04ddb56e3596d086252f9bfccfdb95f2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -76,7 +76,12 @@ public class ServerConnectionListener {
+@@ -78,7 +78,12 @@ public class ServerConnectionListener {
          this.running = true;
      }
  
@@ -69,7 +69,7 @@ index 2ea40a23539898b9c817440aafc91f4b5fd10977..2e7540b0e100347cd91624c9d61a5c46
          List list = this.channels;
  
          synchronized (this.channels) {
-@@ -84,7 +89,13 @@ public class ServerConnectionListener {
+@@ -86,7 +91,13 @@ public class ServerConnectionListener {
              EventLoopGroup eventloopgroup;
  
              if (Epoll.isAvailable() && this.server.isEpollEnabled()) {
@@ -83,7 +83,7 @@ index 2ea40a23539898b9c817440aafc91f4b5fd10977..2e7540b0e100347cd91624c9d61a5c46
                  eventloopgroup = (EventLoopGroup) ServerConnectionListener.SERVER_EPOLL_EVENT_GROUP.get();
                  ServerConnectionListener.LOGGER.info("Using epoll channel type");
              } else {
-@@ -115,7 +126,7 @@ public class ServerConnectionListener {
+@@ -118,7 +129,7 @@ public class ServerConnectionListener {
                      ((Connection) object).setListenerForServerboundHandshake(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
                      io.papermc.paper.network.ChannelInitializeListenerHolder.callListeners(channel); // Paper
                  }
diff --git a/patches/server/0604-Add-EntityInsideBlockEvent.patch b/patches/server/0605-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0604-Add-EntityInsideBlockEvent.patch
rename to patches/server/0605-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0605-Attributes-API-for-item-defaults.patch b/patches/server/0606-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0605-Attributes-API-for-item-defaults.patch
rename to patches/server/0606-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0606-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0606-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0607-More-Lidded-Block-API.patch b/patches/server/0608-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0607-More-Lidded-Block-API.patch
rename to patches/server/0608-More-Lidded-Block-API.patch
diff --git a/patches/server/0608-Limit-item-frame-cursors-on-maps.patch b/patches/server/0609-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0608-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0609-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0609-Add-PlayerKickEvent-causes.patch b/patches/server/0610-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0609-Add-PlayerKickEvent-causes.patch
rename to patches/server/0610-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0610-Add-PufferFishStateChangeEvent.patch b/patches/server/0611-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0610-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0611-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0611-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0611-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0612-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0612-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0613-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0613-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0614-Add-BellRevealRaiderEvent.patch b/patches/server/0615-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0614-Add-BellRevealRaiderEvent.patch
rename to patches/server/0615-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0615-Fix-invulnerable-end-crystals.patch b/patches/server/0616-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0615-Fix-invulnerable-end-crystals.patch
rename to patches/server/0616-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0616-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0617-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0616-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0617-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0617-Fix-dangerous-end-portal-logic.patch b/patches/server/0618-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0617-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0618-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0618-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0618-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0619-Make-item-validations-configurable.patch b/patches/server/0620-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0619-Make-item-validations-configurable.patch
rename to patches/server/0620-Make-item-validations-configurable.patch
diff --git a/patches/server/0620-Line-Of-Sight-Changes.patch b/patches/server/0621-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0620-Line-Of-Sight-Changes.patch
rename to patches/server/0621-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0621-add-per-world-spawn-limits.patch b/patches/server/0622-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0621-add-per-world-spawn-limits.patch
rename to patches/server/0622-add-per-world-spawn-limits.patch
diff --git a/patches/server/0622-Fix-potions-splash-events.patch b/patches/server/0623-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0622-Fix-potions-splash-events.patch
rename to patches/server/0623-Fix-potions-splash-events.patch
diff --git a/patches/server/0623-Add-more-LimitedRegion-API.patch b/patches/server/0624-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0623-Add-more-LimitedRegion-API.patch
rename to patches/server/0624-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0624-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0624-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0625-Missing-Entity-API.patch b/patches/server/0626-Missing-Entity-API.patch
similarity index 100%
rename from patches/server/0625-Missing-Entity-API.patch
rename to patches/server/0626-Missing-Entity-API.patch
diff --git a/patches/server/0626-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0626-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0627-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0627-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0628-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0628-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0629-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0629-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0630-Adds-PlayerArmSwingEvent.patch b/patches/server/0631-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0630-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0631-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0631-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0631-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0632-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0632-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0633-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0634-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0633-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0634-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0634-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0634-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0635-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0635-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0635-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0636-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0636-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0637-Stinger-API.patch b/patches/server/0638-Stinger-API.patch
similarity index 100%
rename from patches/server/0637-Stinger-API.patch
rename to patches/server/0638-Stinger-API.patch
diff --git a/patches/server/0638-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0638-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0639-Add-System.out-err-catcher.patch b/patches/server/0640-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0639-Add-System.out-err-catcher.patch
rename to patches/server/0640-Add-System.out-err-catcher.patch
diff --git a/patches/server/0640-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0640-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0641-Improve-boat-collision-performance.patch b/patches/server/0642-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0641-Improve-boat-collision-performance.patch
rename to patches/server/0642-Improve-boat-collision-performance.patch
diff --git a/patches/server/0642-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0642-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0643-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0643-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0644-Add-PlayerSetSpawnEvent.patch b/patches/server/0645-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0644-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0645-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0645-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0645-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0646-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0647-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0646-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0647-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0647-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0648-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0647-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0648-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0648-Added-EntityDamageItemEvent.patch b/patches/server/0649-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0648-Added-EntityDamageItemEvent.patch
rename to patches/server/0649-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0649-Optimize-indirect-passenger-iteration.patch b/patches/server/0650-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0649-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0650-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0650-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0650-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0651-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0652-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0651-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0652-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0652-Clear-bucket-NBT-after-dispense.patch b/patches/server/0653-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0652-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0653-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0653-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0653-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0654-Add-BlockBreakBlockEvent.patch b/patches/server/0655-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0654-Add-BlockBreakBlockEvent.patch
rename to patches/server/0655-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0655-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0655-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0656-More-CommandBlock-API.patch b/patches/server/0657-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0656-More-CommandBlock-API.patch
rename to patches/server/0657-More-CommandBlock-API.patch
diff --git a/patches/server/0657-Add-missing-team-sidebar-display-slots.patch b/patches/server/0658-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0657-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0658-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0658-Add-back-EntityPortalExitEvent.patch b/patches/server/0659-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0658-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0659-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0659-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0659-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0660-Get-entity-default-attributes.patch b/patches/server/0661-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0660-Get-entity-default-attributes.patch
rename to patches/server/0661-Get-entity-default-attributes.patch
diff --git a/patches/server/0661-Left-handed-API.patch b/patches/server/0662-Left-handed-API.patch
similarity index 100%
rename from patches/server/0661-Left-handed-API.patch
rename to patches/server/0662-Left-handed-API.patch
diff --git a/patches/server/0662-Add-more-advancement-API.patch b/patches/server/0663-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0662-Add-more-advancement-API.patch
rename to patches/server/0663-Add-more-advancement-API.patch
diff --git a/patches/server/0663-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0663-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0664-Add-critical-damage-API.patch b/patches/server/0665-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0664-Add-critical-damage-API.patch
rename to patches/server/0665-Add-critical-damage-API.patch
diff --git a/patches/server/0665-Fix-issues-with-mob-conversion.patch b/patches/server/0666-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0665-Fix-issues-with-mob-conversion.patch
rename to patches/server/0666-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0666-Add-isCollidable-methods-to-various-places.patch b/patches/server/0667-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0666-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0667-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0667-Goat-ram-API.patch b/patches/server/0668-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0667-Goat-ram-API.patch
rename to patches/server/0668-Goat-ram-API.patch
diff --git a/patches/server/0668-Add-API-for-resetting-a-single-score.patch b/patches/server/0669-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0668-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0669-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0669-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0669-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0670-Vanilla-command-permission-fixes.patch b/patches/server/0671-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0670-Vanilla-command-permission-fixes.patch
rename to patches/server/0671-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0671-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0671-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0672-Fix-GameProfileCache-concurrency.patch b/patches/server/0673-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0672-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0673-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0673-Improve-and-expand-AsyncCatcher.patch b/patches/server/0674-Improve-and-expand-AsyncCatcher.patch
similarity index 100%
rename from patches/server/0673-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0674-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0674-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0674-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0675-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0676-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0675-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0676-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0676-Optimise-general-POI-access.patch b/patches/server/0677-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0676-Optimise-general-POI-access.patch
rename to patches/server/0677-Optimise-general-POI-access.patch
diff --git a/patches/server/0677-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0677-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0678-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0679-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0678-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0679-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0679-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0679-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0680-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0680-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0681-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0681-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0682-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0682-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0683-Time-scoreboard-search.patch b/patches/server/0684-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0683-Time-scoreboard-search.patch
rename to patches/server/0684-Time-scoreboard-search.patch
diff --git a/patches/server/0684-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0684-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0685-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0685-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0686-Execute-chunk-tasks-mid-tick.patch b/patches/server/0687-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0686-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0687-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0687-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0688-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0687-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0688-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0688-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0688-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0689-Optimise-random-block-ticking.patch b/patches/server/0690-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0689-Optimise-random-block-ticking.patch
rename to patches/server/0690-Optimise-random-block-ticking.patch
diff --git a/patches/server/0690-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0690-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0691-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch
similarity index 97%
rename from patches/server/0691-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch
index 150a6c9f29..64046eabdb 100644
--- a/patches/server/0691-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch
@@ -264,10 +264,10 @@ index 859af8c845bae9781a62fa4acae56c6e2d449e10..ec7239fd6a2ecf732d2843f9426e4cb6
          return this.threshold;
      }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 1f536fb6f96edb78953abd295096e60272044ac7..6d717c645d42c267efa99845f4f92fddec97660a 100644
+index c06473f8c6cb116071e256747bc95c38dd2015a6..cb82729631f3944cbf068ff730df0c2e1c3b2e1f 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -585,11 +585,28 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -669,11 +669,28 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
          return networkmanager;
      }
  
@@ -300,7 +300,7 @@ index 1f536fb6f96edb78953abd295096e60272044ac7..6d717c645d42c267efa99845f4f92fdd
  
      public boolean isEncrypted() {
          return this.encrypted;
-@@ -622,16 +639,17 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -706,16 +723,17 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
  
      public void setupCompression(int compressionThreshold, boolean rejectsBadPackets) {
          if (compressionThreshold >= 0) {
@@ -321,10 +321,10 @@ index 1f536fb6f96edb78953abd295096e60272044ac7..6d717c645d42c267efa99845f4f92fdd
              this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_THRESHOLD_SET); // Paper
          } else {
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 2e7540b0e100347cd91624c9d61a5c4688a52b26..dbefe5450b9d8d9c32c30a06afd614725f890d00 100644
+index 5f625acf04ddb56e3596d086252f9bfccfdb95f2..54c7f34ba3dc8466223e589702d0c93af8cf52a0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -104,6 +104,11 @@ public class ServerConnectionListener {
+@@ -106,6 +106,11 @@ public class ServerConnectionListener {
                  ServerConnectionListener.LOGGER.info("Using default channel type");
              }
  
diff --git a/patches/server/0692-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch
similarity index 98%
rename from patches/server/0692-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0693-Detail-more-information-in-watchdog-dumps.patch
index d3f1c95dc3..7305bb4eb2 100644
--- a/patches/server/0692-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Detail more information in watchdog dumps
 - Dump player name, player uuid, position, and world for packet handling
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 6d717c645d42c267efa99845f4f92fddec97660a..aabd85416d2c64b29dda991304650214247df164 100644
+index cb82729631f3944cbf068ff730df0c2e1c3b2e1f..fdfd07b76b904e5ad70ca63a44f2442500f1e887 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -438,7 +438,13 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -521,7 +521,13 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
              if (!(this.packetListener instanceof net.minecraft.server.network.ServerLoginPacketListenerImpl loginPacketListener)
                  || loginPacketListener.state != net.minecraft.server.network.ServerLoginPacketListenerImpl.State.VERIFYING
                  || Connection.joinAttemptsThisTick++ < MAX_PER_TICK) {
diff --git a/patches/server/0693-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0693-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0694-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0694-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0695-Distance-manager-tick-timings.patch b/patches/server/0696-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0695-Distance-manager-tick-timings.patch
rename to patches/server/0696-Distance-manager-tick-timings.patch
diff --git a/patches/server/0696-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0696-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0697-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0697-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0698-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0698-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0699-Add-packet-limiter-config.patch b/patches/server/0700-Add-packet-limiter-config.patch
similarity index 96%
rename from patches/server/0699-Add-packet-limiter-config.patch
rename to patches/server/0700-Add-packet-limiter-config.patch
index 5ee7ebcd05..7d96f03ebb 100644
--- a/patches/server/0699-Add-packet-limiter-config.patch
+++ b/patches/server/0700-Add-packet-limiter-config.patch
@@ -24,10 +24,10 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index aabd85416d2c64b29dda991304650214247df164..95fc3899fae5ed2b46733fc423517a5954e984c2 100644
+index fdfd07b76b904e5ad70ca63a44f2442500f1e887..91fcb63835b0b725c53bc75be782b5c5bcc870e7 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -128,6 +128,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -132,6 +132,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
          return null;
      }
      // Paper end - add utility methods
@@ -50,7 +50,7 @@ index aabd85416d2c64b29dda991304650214247df164..95fc3899fae5ed2b46733fc423517a59
  
      public Connection(PacketFlow side) {
          this.receiving = side;
-@@ -220,6 +236,55 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -224,6 +240,55 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
              if (packetlistener == null) {
                  throw new IllegalStateException("Received a packet before the packet listener was initialized");
              } else {
diff --git a/patches/server/0700-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0700-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0701-Ensure-valid-vehicle-status.patch b/patches/server/0702-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0701-Ensure-valid-vehicle-status.patch
rename to patches/server/0702-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0702-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0702-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0703-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0703-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0704-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0705-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0704-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0705-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0705-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0706-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0705-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0706-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0706-Preserve-overstacked-loot.patch b/patches/server/0707-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0706-Preserve-overstacked-loot.patch
rename to patches/server/0707-Preserve-overstacked-loot.patch
diff --git a/patches/server/0707-Update-head-rotation-in-missing-places.patch b/patches/server/0708-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0707-Update-head-rotation-in-missing-places.patch
rename to patches/server/0708-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0708-prevent-unintended-light-block-manipulation.patch b/patches/server/0709-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0708-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0709-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0709-Fix-CraftCriteria-defaults-map.patch b/patches/server/0710-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0709-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0710-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0710-Fix-upstreams-block-state-factories.patch b/patches/server/0711-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0710-Fix-upstreams-block-state-factories.patch
rename to patches/server/0711-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0711-Configurable-feature-seeds.patch b/patches/server/0712-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0711-Configurable-feature-seeds.patch
rename to patches/server/0712-Configurable-feature-seeds.patch
diff --git a/patches/server/0712-Add-root-admin-user-detection.patch b/patches/server/0713-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0712-Add-root-admin-user-detection.patch
rename to patches/server/0713-Add-root-admin-user-detection.patch
diff --git a/patches/server/0713-Always-allow-item-changing-in-Fireball.patch b/patches/server/0714-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0713-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0714-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0714-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0714-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0715-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0715-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0716-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0716-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0717-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0717-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0718-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0718-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0719-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0719-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0720-Fix-Spigot-growth-modifiers.patch b/patches/server/0721-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0720-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0721-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0721-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0721-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0722-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0723-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0722-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0723-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0723-Optimize-HashMapPalette.patch b/patches/server/0724-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0723-Optimize-HashMapPalette.patch
rename to patches/server/0724-Optimize-HashMapPalette.patch
diff --git a/patches/server/0724-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0724-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0725-Collision-optimisations.patch b/patches/server/0726-Collision-optimisations.patch
similarity index 100%
rename from patches/server/0725-Collision-optimisations.patch
rename to patches/server/0726-Collision-optimisations.patch
diff --git a/patches/server/0726-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0726-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0727-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0727-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0728-Add-more-Campfire-API.patch b/patches/server/0729-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0728-Add-more-Campfire-API.patch
rename to patches/server/0729-Add-more-Campfire-API.patch
diff --git a/patches/server/0729-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0729-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0730-Fix-tripwire-state-inconsistency.patch b/patches/server/0731-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0730-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0731-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0731-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0732-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0731-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0732-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0732-Improve-scoreboard-entries.patch b/patches/server/0733-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0732-Improve-scoreboard-entries.patch
rename to patches/server/0733-Improve-scoreboard-entries.patch
diff --git a/patches/server/0733-Entity-powdered-snow-API.patch b/patches/server/0734-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0733-Entity-powdered-snow-API.patch
rename to patches/server/0734-Entity-powdered-snow-API.patch
diff --git a/patches/server/0734-Add-API-for-item-entity-health.patch b/patches/server/0735-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0734-Add-API-for-item-entity-health.patch
rename to patches/server/0735-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0735-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0735-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0736-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0736-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0737-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0737-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0738-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0738-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0739-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0739-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0740-Fix-bees-aging-inside-hives.patch b/patches/server/0741-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0740-Fix-bees-aging-inside-hives.patch
rename to patches/server/0741-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0741-Bucketable-API.patch b/patches/server/0742-Bucketable-API.patch
similarity index 100%
rename from patches/server/0741-Bucketable-API.patch
rename to patches/server/0742-Bucketable-API.patch
diff --git a/patches/server/0742-Validate-usernames.patch b/patches/server/0743-Validate-usernames.patch
similarity index 100%
rename from patches/server/0742-Validate-usernames.patch
rename to patches/server/0743-Validate-usernames.patch
diff --git a/patches/server/0743-Make-water-animal-spawn-height-configurable.patch b/patches/server/0744-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0743-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0744-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0744-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0744-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0745-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0745-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0746-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0746-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0747-Multiple-Entries-with-Scoreboards.patch b/patches/server/0748-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0747-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0748-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0748-Reset-placed-block-on-exception.patch b/patches/server/0749-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0748-Reset-placed-block-on-exception.patch
rename to patches/server/0749-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0749-Add-configurable-height-for-slime-spawn.patch b/patches/server/0750-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0749-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0750-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0750-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0750-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0751-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0752-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0751-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0752-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0752-Kick-on-main-for-illegal-chat.patch b/patches/server/0753-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0752-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0753-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0753-Multi-Block-Change-API-Implementation.patch b/patches/server/0754-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0753-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0754-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0754-Fix-NotePlayEvent.patch b/patches/server/0755-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0754-Fix-NotePlayEvent.patch
rename to patches/server/0755-Fix-NotePlayEvent.patch
diff --git a/patches/server/0755-Freeze-Tick-Lock-API.patch b/patches/server/0756-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0755-Freeze-Tick-Lock-API.patch
rename to patches/server/0756-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0756-Dolphin-API.patch b/patches/server/0757-Dolphin-API.patch
similarity index 100%
rename from patches/server/0756-Dolphin-API.patch
rename to patches/server/0757-Dolphin-API.patch
diff --git a/patches/server/0757-More-PotionEffectType-API.patch b/patches/server/0758-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0757-More-PotionEffectType-API.patch
rename to patches/server/0758-More-PotionEffectType-API.patch
diff --git a/patches/server/0758-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0758-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0759-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0759-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0760-Add-missing-structure-set-seed-configs.patch b/patches/server/0761-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0760-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0761-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0761-Implement-regenerateChunk.patch b/patches/server/0762-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0761-Implement-regenerateChunk.patch
rename to patches/server/0762-Implement-regenerateChunk.patch
diff --git a/patches/server/0762-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0762-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0763-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0763-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0764-Add-GameEvent-tags.patch b/patches/server/0765-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0764-Add-GameEvent-tags.patch
rename to patches/server/0765-Add-GameEvent-tags.patch
diff --git a/patches/server/0765-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0765-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0766-Furnace-RecipesUsed-API.patch b/patches/server/0767-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0766-Furnace-RecipesUsed-API.patch
rename to patches/server/0767-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0767-Configurable-sculk-sensor-listener-range.patch b/patches/server/0768-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0767-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0768-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0768-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0769-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0768-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0769-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0769-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0769-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0770-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0770-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0771-Fix-Entity-Position-Desync.patch b/patches/server/0772-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0771-Fix-Entity-Position-Desync.patch
rename to patches/server/0772-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0772-Custom-Potion-Mixes.patch b/patches/server/0773-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0772-Custom-Potion-Mixes.patch
rename to patches/server/0773-Custom-Potion-Mixes.patch
diff --git a/patches/server/0773-Force-close-world-loading-screen.patch b/patches/server/0774-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0773-Force-close-world-loading-screen.patch
rename to patches/server/0774-Force-close-world-loading-screen.patch
diff --git a/patches/server/0774-Fix-falling-block-spawn-methods.patch b/patches/server/0775-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0774-Fix-falling-block-spawn-methods.patch
rename to patches/server/0775-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0775-Expose-furnace-minecart-push-values.patch b/patches/server/0776-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0775-Expose-furnace-minecart-push-values.patch
rename to patches/server/0776-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0776-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0776-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0777-More-Projectile-API.patch b/patches/server/0778-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0777-More-Projectile-API.patch
rename to patches/server/0778-More-Projectile-API.patch
diff --git a/patches/server/0778-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0778-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0779-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0779-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0780-Implement-getComputedBiome-API.patch b/patches/server/0781-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0780-Implement-getComputedBiome-API.patch
rename to patches/server/0781-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0781-Make-some-itemstacks-nonnull.patch b/patches/server/0782-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0781-Make-some-itemstacks-nonnull.patch
rename to patches/server/0782-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0782-Implement-enchantWithLevels-API.patch b/patches/server/0783-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0782-Implement-enchantWithLevels-API.patch
rename to patches/server/0783-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0783-Fix-saving-in-unloadWorld.patch b/patches/server/0784-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0783-Fix-saving-in-unloadWorld.patch
rename to patches/server/0784-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0784-Buffer-OOB-setBlock-calls.patch b/patches/server/0785-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0784-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0785-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0785-Add-TameableDeathMessageEvent.patch b/patches/server/0786-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0785-Add-TameableDeathMessageEvent.patch
rename to patches/server/0786-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0786-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0786-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0787-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0787-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0788-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0788-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0789-Guard-against-invalid-entity-positions.patch b/patches/server/0790-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0789-Guard-against-invalid-entity-positions.patch
rename to patches/server/0790-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0790-cache-resource-keys.patch b/patches/server/0791-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0790-cache-resource-keys.patch
rename to patches/server/0791-cache-resource-keys.patch
diff --git a/patches/server/0791-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0791-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0792-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0792-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0793-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0793-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0794-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0794-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0795-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0795-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0796-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0796-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0797-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0797-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0798-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0798-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0799-WorldCreator-keepSpawnLoaded.patch b/patches/server/0800-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0799-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0800-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0800-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0800-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0801-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0801-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0802-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0802-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0803-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0803-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0804-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0804-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0805-Add-PlayerStopUsingItemEvent.patch b/patches/server/0806-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0805-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0806-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0806-FallingBlock-auto-expire-setting.patch b/patches/server/0807-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0806-FallingBlock-auto-expire-setting.patch
rename to patches/server/0807-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0807-Don-t-tick-markers.patch b/patches/server/0808-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0807-Don-t-tick-markers.patch
rename to patches/server/0808-Don-t-tick-markers.patch
diff --git a/patches/server/0808-Do-not-accept-invalid-client-settings.patch b/patches/server/0809-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0808-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0809-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0809-Add-support-for-Proxy-Protocol.patch b/patches/server/0810-Add-support-for-Proxy-Protocol.patch
similarity index 95%
rename from patches/server/0809-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0810-Add-support-for-Proxy-Protocol.patch
index 10cbf27693..77d340fcf7 100644
--- a/patches/server/0809-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0810-Add-support-for-Proxy-Protocol.patch
@@ -17,10 +17,10 @@ index 7df1b44674ba5e826ad7c96c9d242865a3282307..26618ddf85952694ae2c78f41a19e4b9
      implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
      implementation("org.ow2.asm:asm:9.5")
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index dbefe5450b9d8d9c32c30a06afd614725f890d00..12bdcbd265d24a0c013303246d33545c22b01595 100644
+index 54c7f34ba3dc8466223e589702d0c93af8cf52a0..79326308f6126f84a3cbb3d5a33302de048d8a50 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -109,6 +109,12 @@ public class ServerConnectionListener {
+@@ -111,6 +111,12 @@ public class ServerConnectionListener {
              ServerConnectionListener.LOGGER.info("Paper: Using " + com.velocitypowered.natives.util.Natives.cipher.getLoadedVariant() + " cipher from Velocity.");
              // Paper end
  
@@ -33,7 +33,7 @@ index dbefe5450b9d8d9c32c30a06afd614725f890d00..12bdcbd265d24a0c013303246d33545c
              this.channels.add(((ServerBootstrap) ((ServerBootstrap) (new ServerBootstrap()).channel(oclass)).childHandler(new ChannelInitializer<Channel>() {
                  protected void initChannel(Channel channel) {
                      Connection.setInitialProtocolAttributes(channel);
-@@ -126,6 +132,29 @@ public class ServerConnectionListener {
+@@ -129,6 +135,29 @@ public class ServerConnectionListener {
                      Connection object = j > 0 ? new RateKickingConnection(j) : new Connection(PacketFlow.SERVERBOUND); // CraftBukkit - decompile error
  
                      //ServerConnectionListener.this.connections.add(object); // Paper
diff --git a/patches/server/0810-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0810-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0811-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0811-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0812-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0812-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0813-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0813-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0814-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0814-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0815-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0815-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0816-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0817-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0816-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0817-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0817-Dont-resent-entity-on-art-update.patch b/patches/server/0818-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0817-Dont-resent-entity-on-art-update.patch
rename to patches/server/0818-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0818-Add-WardenAngerChangeEvent.patch b/patches/server/0819-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0818-Add-WardenAngerChangeEvent.patch
rename to patches/server/0819-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0819-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0819-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0820-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0820-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0821-Nameable-Banner-API.patch b/patches/server/0822-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0821-Nameable-Banner-API.patch
rename to patches/server/0822-Nameable-Banner-API.patch
diff --git a/patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0823-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0823-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0824-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0824-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0825-Add-Player-getFishHook.patch b/patches/server/0826-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0825-Add-Player-getFishHook.patch
rename to patches/server/0826-Add-Player-getFishHook.patch
diff --git a/patches/server/0826-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0826-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0827-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0827-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0828-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0828-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0829-Fix-Bee-flower-NPE.patch b/patches/server/0830-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0829-Fix-Bee-flower-NPE.patch
rename to patches/server/0830-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0830-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0830-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0831-More-Teleport-API.patch b/patches/server/0832-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0831-More-Teleport-API.patch
rename to patches/server/0832-More-Teleport-API.patch
diff --git a/patches/server/0832-Add-EntityPortalReadyEvent.patch b/patches/server/0833-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0832-Add-EntityPortalReadyEvent.patch
rename to patches/server/0833-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0833-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0833-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0834-Send-block-entities-after-destroy-prediction.patch b/patches/server/0835-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0834-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0835-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0835-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0835-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0836-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0836-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0837-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0837-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0838-Collision-API.patch b/patches/server/0839-Collision-API.patch
similarity index 100%
rename from patches/server/0838-Collision-API.patch
rename to patches/server/0839-Collision-API.patch
diff --git a/patches/server/0839-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0839-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0840-Block-Ticking-API.patch b/patches/server/0841-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0840-Block-Ticking-API.patch
rename to patches/server/0841-Block-Ticking-API.patch
diff --git a/patches/server/0841-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0841-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0842-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0842-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0843-Add-NamespacedKey-biome-methods.patch b/patches/server/0844-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0843-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0844-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0844-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0844-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0845-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0845-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0846-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0846-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0847-Missing-eating-regain-reason.patch b/patches/server/0848-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0847-Missing-eating-regain-reason.patch
rename to patches/server/0848-Missing-eating-regain-reason.patch
diff --git a/patches/server/0848-Missing-effect-cause.patch b/patches/server/0849-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0848-Missing-effect-cause.patch
rename to patches/server/0849-Missing-effect-cause.patch
diff --git a/patches/server/0849-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0849-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0850-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0850-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0851-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0852-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0851-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0852-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0852-Configurable-chat-thread-limit.patch b/patches/server/0853-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0852-Configurable-chat-thread-limit.patch
rename to patches/server/0853-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0853-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0853-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0854-fix-Jigsaw-block-kicking-user.patch b/patches/server/0855-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0854-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0855-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0855-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0855-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0856-Add-getDrops-to-BlockState.patch b/patches/server/0857-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0856-Add-getDrops-to-BlockState.patch
rename to patches/server/0857-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0857-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0857-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0858-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0858-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0859-Fix-custom-piglin-loved-items.patch b/patches/server/0860-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0859-Fix-custom-piglin-loved-items.patch
rename to patches/server/0860-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0860-EntityPickupItemEvent-fixes.patch b/patches/server/0861-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0860-EntityPickupItemEvent-fixes.patch
rename to patches/server/0861-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0861-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0861-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0862-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0862-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0863-Elder-Guardian-appearance-API.patch b/patches/server/0864-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0863-Elder-Guardian-appearance-API.patch
rename to patches/server/0864-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0864-Allow-changing-bed-s-occupied-property.patch b/patches/server/0865-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0864-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0865-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0865-Add-entity-knockback-API.patch b/patches/server/0866-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0865-Add-entity-knockback-API.patch
rename to patches/server/0866-Add-entity-knockback-API.patch
diff --git a/patches/server/0866-Detect-headless-JREs.patch b/patches/server/0867-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0866-Detect-headless-JREs.patch
rename to patches/server/0867-Detect-headless-JREs.patch
diff --git a/patches/server/0867-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0867-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0868-optimized-dirt-and-snow-spreading.patch b/patches/server/0869-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0868-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0869-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0869-Added-EntityToggleSitEvent.patch b/patches/server/0870-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0869-Added-EntityToggleSitEvent.patch
rename to patches/server/0870-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0870-Add-fire-tick-delay-option.patch b/patches/server/0871-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0870-Add-fire-tick-delay-option.patch
rename to patches/server/0871-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0871-Add-Moving-Piston-API.patch b/patches/server/0872-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0871-Add-Moving-Piston-API.patch
rename to patches/server/0872-Add-Moving-Piston-API.patch
diff --git a/patches/server/0872-Ignore-impossible-spawn-tick.patch b/patches/server/0873-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0872-Ignore-impossible-spawn-tick.patch
rename to patches/server/0873-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0873-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0873-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0874-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0874-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0875-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0875-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0876-Prevent-compass-from-loading-chunks.patch b/patches/server/0877-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0876-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0877-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0877-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0878-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0877-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0878-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0878-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0878-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0879-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0879-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0880-Add-Player-Warden-Warning-API.patch b/patches/server/0881-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0880-Add-Player-Warden-Warning-API.patch
rename to patches/server/0881-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0881-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0881-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0882-Add-paper-dumplisteners-command.patch b/patches/server/0883-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0882-Add-paper-dumplisteners-command.patch
rename to patches/server/0883-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0883-check-global-player-list-where-appropriate.patch b/patches/server/0884-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0883-check-global-player-list-where-appropriate.patch
rename to patches/server/0884-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0884-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0884-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0885-ItemStack-damage-API.patch b/patches/server/0886-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0885-ItemStack-damage-API.patch
rename to patches/server/0886-ItemStack-damage-API.patch
diff --git a/patches/server/0886-Friction-API.patch b/patches/server/0887-Friction-API.patch
similarity index 100%
rename from patches/server/0886-Friction-API.patch
rename to patches/server/0887-Friction-API.patch
diff --git a/patches/server/0887-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0887-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0888-Fix-player-kick-on-shutdown.patch b/patches/server/0889-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0888-Fix-player-kick-on-shutdown.patch
rename to patches/server/0889-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0889-Sync-offhand-slot-in-menus.patch b/patches/server/0890-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0889-Sync-offhand-slot-in-menus.patch
rename to patches/server/0890-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0890-Player-Entity-Tracking-Events.patch b/patches/server/0891-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0890-Player-Entity-Tracking-Events.patch
rename to patches/server/0891-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0891-Limit-pet-look-distance.patch b/patches/server/0892-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0891-Limit-pet-look-distance.patch
rename to patches/server/0892-Limit-pet-look-distance.patch
diff --git a/patches/server/0892-Properly-resend-entities.patch b/patches/server/0893-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/0892-Properly-resend-entities.patch
rename to patches/server/0893-Properly-resend-entities.patch
diff --git a/patches/server/0893-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0893-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0894-fix-Instruments.patch b/patches/server/0895-fix-Instruments.patch
similarity index 100%
rename from patches/server/0894-fix-Instruments.patch
rename to patches/server/0895-fix-Instruments.patch
diff --git a/patches/server/0895-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0895-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0896-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0896-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0897-Add-BlockLockCheckEvent.patch b/patches/server/0898-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0897-Add-BlockLockCheckEvent.patch
rename to patches/server/0898-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0898-Add-Sneaking-API-for-Entities.patch b/patches/server/0899-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0898-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0899-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0899-Improve-logging-and-errors.patch b/patches/server/0900-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0899-Improve-logging-and-errors.patch
rename to patches/server/0900-Improve-logging-and-errors.patch
diff --git a/patches/server/0900-Improve-PortalEvents.patch b/patches/server/0901-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0900-Improve-PortalEvents.patch
rename to patches/server/0901-Improve-PortalEvents.patch
diff --git a/patches/server/0901-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0901-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0902-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0902-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0903-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0903-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0904-Flying-Fall-Damage.patch b/patches/server/0905-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0904-Flying-Fall-Damage.patch
rename to patches/server/0905-Flying-Fall-Damage.patch
diff --git a/patches/server/0905-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0905-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0906-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0906-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0907-config-for-disabling-entity-tag-tags.patch b/patches/server/0908-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0907-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0908-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0908-Use-single-player-info-update-packet-on-join.patch b/patches/server/0909-Use-single-player-info-update-packet-on-join.patch
similarity index 100%
rename from patches/server/0908-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0909-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0909-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0909-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0910-Win-Screen-API.patch b/patches/server/0911-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0910-Win-Screen-API.patch
rename to patches/server/0911-Win-Screen-API.patch
diff --git a/patches/server/0911-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0911-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0912-Fix-force-opening-enchantment-tables.patch b/patches/server/0913-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0912-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0913-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0913-Add-Entity-Body-Yaw-API.patch b/patches/server/0914-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0913-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0914-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0914-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0914-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0915-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 100%
rename from patches/server/0915-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0916-Add-EntityFertilizeEggEvent.patch b/patches/server/0917-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0916-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0917-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0917-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0917-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0918-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0918-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0919-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0919-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0920-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0920-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0921-Fix-text-display-error-on-spawn.patch b/patches/server/0922-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0921-Fix-text-display-error-on-spawn.patch
rename to patches/server/0922-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0922-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0922-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0923-Add-Shearable-API.patch b/patches/server/0924-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0923-Add-Shearable-API.patch
rename to patches/server/0924-Add-Shearable-API.patch
diff --git a/patches/server/0924-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0924-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0925-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0926-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
similarity index 100%
rename from patches/server/0925-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
rename to patches/server/0926-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0926-Optimize-Hoppers.patch b/patches/server/0927-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0926-Optimize-Hoppers.patch
rename to patches/server/0927-Optimize-Hoppers.patch
diff --git a/patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0928-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0928-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0929-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0929-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0929-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0930-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0929-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0930-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0930-remove-duplicate-animate-packet-for-records.patch b/patches/server/0931-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0930-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0931-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0933-Use-array-for-gamerule-storage.patch b/patches/server/0934-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0933-Use-array-for-gamerule-storage.patch
rename to patches/server/0934-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0936-Add-Mob-Experience-reward-API.patch b/patches/server/0937-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0936-Add-Mob-Experience-reward-API.patch
rename to patches/server/0937-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0940-More-accurate-isInOpenWater-impl.patch b/patches/server/0941-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0940-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0941-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0943-Expand-PlayerItemMendEvent.patch b/patches/server/0944-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0943-Expand-PlayerItemMendEvent.patch
rename to patches/server/0944-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0945-Add-transient-modifier-API.patch b/patches/server/0946-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0945-Add-transient-modifier-API.patch
rename to patches/server/0946-Add-transient-modifier-API.patch
diff --git a/patches/server/0946-Fix-block-place-logic.patch b/patches/server/0947-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0946-Fix-block-place-logic.patch
rename to patches/server/0947-Fix-block-place-logic.patch
diff --git a/patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch
similarity index 100%
rename from patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch
rename to patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0952-Fix-sniffer-removeExploredLocation.patch b/patches/server/0953-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0952-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0953-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 100%
rename from patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0956-Properly-Cancel-Usable-Items.patch b/patches/server/0957-Properly-Cancel-Usable-Items.patch
similarity index 100%
rename from patches/server/0956-Properly-Cancel-Usable-Items.patch
rename to patches/server/0957-Properly-Cancel-Usable-Items.patch
diff --git a/patches/server/0957-Add-event-for-player-editing-sign.patch b/patches/server/0958-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0957-Add-event-for-player-editing-sign.patch
rename to patches/server/0958-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0959-Improve-command-function-perm-level-checks.patch b/patches/server/0960-Improve-command-function-perm-level-checks.patch
similarity index 100%
rename from patches/server/0959-Improve-command-function-perm-level-checks.patch
rename to patches/server/0960-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0960-Add-option-to-disable-block-updates.patch b/patches/server/0961-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0960-Add-option-to-disable-block-updates.patch
rename to patches/server/0961-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0961-Call-missing-BlockDispenseEvent.patch b/patches/server/0962-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0961-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0962-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 100%
rename from patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0963-Optimize-player-lookups-for-beacons.patch b/patches/server/0964-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0963-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0964-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0964-Add-Sign-getInteractableSideFor.patch b/patches/server/0965-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0964-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0965-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0965-Array-backed-synched-entity-data.patch b/patches/server/0966-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0965-Array-backed-synched-entity-data.patch
rename to patches/server/0966-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0966-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0967-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0966-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0967-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch
similarity index 100%
rename from patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch
rename to patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch
diff --git a/patches/server/0968-Fix-BanList-API.patch b/patches/server/0969-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0968-Fix-BanList-API.patch
rename to patches/server/0969-Fix-BanList-API.patch
diff --git a/patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0970-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0971-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0970-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0971-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0973-Don-t-tick-signs.patch b/patches/server/0974-Don-t-tick-signs.patch
similarity index 100%
rename from patches/server/0973-Don-t-tick-signs.patch
rename to patches/server/0974-Don-t-tick-signs.patch
diff --git a/patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0975-Add-whitelist-events.patch b/patches/server/0976-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0975-Add-whitelist-events.patch
rename to patches/server/0976-Add-whitelist-events.patch
diff --git a/patches/server/0976-Implement-PlayerFailMoveEvent.patch b/patches/server/0977-Implement-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/server/0976-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0977-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0977-Folia-scheduler-and-owned-region-API.patch b/patches/server/0978-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/server/0977-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0978-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0978-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0979-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0978-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0979-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0979-API-for-updating-recipes-on-clients.patch b/patches/server/0980-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/server/0979-API-for-updating-recipes-on-clients.patch
rename to patches/server/0980-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0980-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0981-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0980-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0981-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0981-Only-capture-actual-tree-growth.patch b/patches/server/0982-Only-capture-actual-tree-growth.patch
similarity index 100%
rename from patches/server/0981-Only-capture-actual-tree-growth.patch
rename to patches/server/0982-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0983-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0983-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0984-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0984-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0984-Use-correct-seed-on-api-world-load.patch b/patches/server/0985-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/0984-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0985-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0986-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0986-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0986-Cache-map-ids-on-item-frames.patch b/patches/server/0987-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0986-Cache-map-ids-on-item-frames.patch
rename to patches/server/0987-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0987-Fix-custom-statistic-criteria-creation.patch b/patches/server/0988-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0987-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0988-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0988-Bandaid-fix-for-Effect.patch b/patches/server/0989-Bandaid-fix-for-Effect.patch
similarity index 100%
rename from patches/server/0988-Bandaid-fix-for-Effect.patch
rename to patches/server/0989-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0989-SculkCatalyst-bloom-API.patch b/patches/server/0990-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0989-SculkCatalyst-bloom-API.patch
rename to patches/server/0990-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0990-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0991-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0990-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0991-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 100%
rename from patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0995-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0995-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0996-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0996-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0997-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 100%
rename from patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0997-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0997-Add-Listing-API-for-Player.patch b/patches/server/0998-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/server/0997-Add-Listing-API-for-Player.patch
rename to patches/server/0998-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0998-Configurable-Region-Compression-Format.patch b/patches/server/0999-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0998-Configurable-Region-Compression-Format.patch
rename to patches/server/0999-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 100%
rename from patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/server/1000-Fix-NPE-on-Boat-getStatus.patch b/patches/server/1001-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/1000-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/1001-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/1001-Expand-Pose-API.patch b/patches/server/1002-Expand-Pose-API.patch
similarity index 100%
rename from patches/server/1001-Expand-Pose-API.patch
rename to patches/server/1002-Expand-Pose-API.patch
diff --git a/patches/server/1002-More-DragonBattle-API.patch b/patches/server/1003-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/1002-More-DragonBattle-API.patch
rename to patches/server/1003-More-DragonBattle-API.patch
diff --git a/patches/server/1003-Deep-clone-unhandled-nbt-tags.patch b/patches/server/1004-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/1003-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/1004-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/1004-Add-PlayerPickItemEvent.patch b/patches/server/1005-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/server/1004-Add-PlayerPickItemEvent.patch
rename to patches/server/1005-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/1005-Improve-performance-of-mass-crafts.patch b/patches/server/1006-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/1005-Improve-performance-of-mass-crafts.patch
rename to patches/server/1006-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1006-Allow-trident-custom-damage.patch b/patches/server/1007-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/1006-Allow-trident-custom-damage.patch
rename to patches/server/1007-Allow-trident-custom-damage.patch
diff --git a/patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1008-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/server/1008-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/1008-Optimize-nearest-structure-border-iteration.patch b/patches/server/1009-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/1008-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/1009-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/1009-Implement-OfflinePlayer-isConnected.patch b/patches/server/1010-Implement-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/server/1009-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/1010-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/1010-Fix-inventory-desync.patch b/patches/server/1011-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/1010-Fix-inventory-desync.patch
rename to patches/server/1011-Fix-inventory-desync.patch
diff --git a/patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/1012-Configure-sniffer-egg-hatch-time.patch b/patches/server/1013-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/1012-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/1013-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1014-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/1014-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1015-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/1015-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1016-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 100%
rename from patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/1016-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1017-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/1017-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1018-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/1018-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/1018-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1019-Fix-silent-equipment-change-for-mobs.patch
similarity index 100%
rename from patches/server/1018-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/1019-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/1019-Fix-spigot-s-Forced-Stats.patch b/patches/server/1020-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/1019-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/1020-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1021-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/1021-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1022-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 100%
rename from patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/1022-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/1022-Actually-optimise-explosions.patch b/patches/server/1023-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/server/1022-Actually-optimise-explosions.patch
rename to patches/server/1023-Actually-optimise-explosions.patch
diff --git a/patches/unapplied/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
deleted file mode 100644
index 28ba534dc3..0000000000
--- a/patches/unapplied/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 6 May 2020 04:53:35 -0400
-Subject: [PATCH] Optimize Network Manager and add advanced packet support
-
-Adds ability for 1 packet to bundle other packets to follow it
-Adds ability for a packet to delay sending more packets until a state is ready.
-
-Removes synchronization from sending packets
-Removes processing packet queue off of main thread
-  - for the few cases where it is allowed, order is not necessary nor
-    should it even be happening concurrently in first place (handshaking/login/status)
-
-Ensures packets sent asynchronously are dispatched on main thread
-
-This helps ensure safety for ProtocolLib as packet listeners
-are commonly accessing world state. This will allow you to schedule
-a packet to be sent async, but itll be dispatched sync for packet
-listeners to process.
-
-This should solve some deadlock risks
-
-Also adds Netty Channel Flush Consolidation to reduce the amount of flushing
-
-Also avoids spamming closed channel exception by rechecking closed state in dispatch
-and then catch exceptions and close if they fire.
-
-Part of this commit was authored by: Spottedleaf, sandtechnology
-
-diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index b293ac99e436b02c9ef30994a394bcc53ebbf2f9..99d5fd192a4cf1ac2739520a111b8dd854ff2f57 100644
---- a/src/main/java/net/minecraft/network/Connection.java
-+++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -120,6 +120,10 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-     public int protocolVersion;
-     public java.net.InetSocketAddress virtualHost;
-     private static boolean enableExplicitFlush = Boolean.getBoolean("paper.explicit-flush");
-+    // Optimize network
-+    public boolean isPending = true;
-+    public boolean queueImmunity = false;
-+    public ConnectionProtocol protocol;
-     // Paper end
- 
-     public Connection(PacketFlow side) {
-@@ -147,6 +151,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-     }
- 
-     public void setProtocol(ConnectionProtocol state) {
-+        protocol = state; // Paper
-         this.channel.attr(Connection.ATTRIBUTE_PROTOCOL).set(state);
-         this.channel.attr(BundlerInfo.BUNDLER_PROVIDER).set(state);
-         this.channel.config().setAutoRead(true);
-@@ -229,19 +234,88 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-         Validate.notNull(listener, "packetListener", new Object[0]);
-         this.packetListener = listener;
-     }
-+    // Paper start
-+    public @Nullable net.minecraft.server.level.ServerPlayer getPlayer() {
-+        if (packetListener instanceof net.minecraft.server.network.ServerGamePacketListenerImpl serverGamePacketListener) {
-+            return serverGamePacketListener.player;
-+        } else {
-+            return null;
-+        }
-+    }
-+    private static class InnerUtil { // Attempt to hide these methods from ProtocolLib so it doesn't accidently pick them up.
-+        private static java.util.List<Packet> buildExtraPackets(Packet packet) {
-+            java.util.List<Packet> extra = packet.getExtraPackets();
-+            if (extra == null || extra.isEmpty()) {
-+                return null;
-+            }
-+            java.util.List<Packet> ret = new java.util.ArrayList<>(1 + extra.size());
-+            buildExtraPackets0(extra, ret);
-+            return ret;
-+        }
-+
-+        private static void buildExtraPackets0(java.util.List<Packet> extraPackets, java.util.List<Packet> into) {
-+            for (Packet extra : extraPackets) {
-+                into.add(extra);
-+                java.util.List<Packet> extraExtra = extra.getExtraPackets();
-+                if (extraExtra != null && !extraExtra.isEmpty()) {
-+                    buildExtraPackets0(extraExtra, into);
-+                }
-+            }
-+        }
-+        // Paper start
-+        private static boolean canSendImmediate(Connection networkManager, Packet<?> packet) {
-+            return networkManager.isPending || networkManager.protocol != ConnectionProtocol.PLAY ||
-+                packet instanceof net.minecraft.network.protocol.game.ClientboundKeepAlivePacket ||
-+                packet instanceof net.minecraft.network.protocol.game.ClientboundPlayerChatPacket ||
-+                packet instanceof net.minecraft.network.protocol.game.ClientboundSystemChatPacket ||
-+                packet instanceof net.minecraft.network.protocol.game.ClientboundCommandSuggestionsPacket ||
-+                packet instanceof net.minecraft.network.protocol.game.ClientboundSetTitleTextPacket ||
-+                packet instanceof net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket ||
-+                packet instanceof net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket ||
-+                packet instanceof net.minecraft.network.protocol.game.ClientboundSetTitlesAnimationPacket ||
-+                packet instanceof net.minecraft.network.protocol.game.ClientboundClearTitlesPacket ||
-+                packet instanceof net.minecraft.network.protocol.game.ClientboundBossEventPacket;
-+        }
-+        // Paper end
-+    }
-+    // Paper end
- 
-     public void send(Packet<?> packet) {
-         this.send(packet, (PacketSendListener) null);
-     }
- 
-     public void send(Packet<?> packet, @Nullable PacketSendListener callbacks) {
--        if (this.isConnected()) {
--            this.flushQueue();
-+        // Paper start - handle oversized packets better
-+        boolean connected = this.isConnected();
-+        if (!connected && !preparing) {
-+            return; // Do nothing
-+        }
-+        packet.onPacketDispatch(getPlayer());
-+        if (connected && (InnerUtil.canSendImmediate(this, packet) || (
-+            io.papermc.paper.util.MCUtil.isMainThread() && packet.isReady() && this.queue.isEmpty() &&
-+            (packet.getExtraPackets() == null || packet.getExtraPackets().isEmpty())
-+        ))) {
-             this.sendPacket(packet, callbacks);
--        } else {
--            this.queue.add(new Connection.PacketHolder(packet, callbacks));
-+            return;
-         }
-+        // write the packets to the queue, then flush - antixray hooks there already
-+        java.util.List<Packet> extraPackets = InnerUtil.buildExtraPackets(packet);
-+        boolean hasExtraPackets = extraPackets != null && !extraPackets.isEmpty();
-+        if (!hasExtraPackets) {
-+            this.queue.add(new Connection.PacketHolder(packet, callbacks));
-+        } else {
-+            java.util.List<Connection.PacketHolder> packets = new java.util.ArrayList<>(1 + extraPackets.size());
-+            packets.add(new Connection.PacketHolder(packet, null)); // delay the future listener until the end of the extra packets
- 
-+            for (int i = 0, len = extraPackets.size(); i < len;) {
-+                Packet extra = extraPackets.get(i);
-+                boolean end = ++i == len;
-+                packets.add(new Connection.PacketHolder(extra, end ? callbacks : null)); // append listener to the end
-+            }
-+            this.queue.addAll(packets); // atomic
-+        }
-+        this.flushQueue();
-+        // Paper end
-     }
- 
-     private void sendPacket(Packet<?> packet, @Nullable PacketSendListener callbacks) {
-@@ -273,6 +347,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-             this.setProtocol(packetState);
-         }
- 
-+        // Paper start
-+        net.minecraft.server.level.ServerPlayer player = getPlayer();
-+        if (!isConnected()) {
-+            packet.onPacketDispatchFinish(player, null);
-+            return;
-+        }
-+
-+        try {
-+            // Paper end
-         ChannelFuture channelfuture = this.channel.writeAndFlush(packet);
- 
-         if (callbacks != null) {
-@@ -291,28 +374,72 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
- 
-             });
-         }
-+        // Paper start
-+        if (packet.hasFinishListener()) {
-+            channelfuture.addListener((ChannelFutureListener) channelFuture -> packet.onPacketDispatchFinish(player, channelFuture));
-+        }
-+        // Paper end
- 
-         channelfuture.addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
-+        // Paper start
-+        } catch (Exception e) {
-+            LOGGER.error("NetworkException: " + player, e);
-+            disconnect(Component.translatable("disconnect.genericReason", "Internal Exception: " + e.getMessage()));
-+            packet.onPacketDispatchFinish(player, null);
-+        }
-+        // Paper end
-     }
- 
-     private ConnectionProtocol getCurrentProtocol() {
-         return (ConnectionProtocol) this.channel.attr(Connection.ATTRIBUTE_PROTOCOL).get();
-     }
- 
--    private void flushQueue() {
-+    // Paper start - rewrite this to be safer if ran off main thread
-+    private boolean flushQueue() { // void -> boolean
-+        if (!isConnected()) {
-+            return true;
-+        }
-+        if (io.papermc.paper.util.MCUtil.isMainThread()) {
-+            return processQueue();
-+        } else if (isPending) {
-+            // Should only happen during login/status stages
-+            synchronized (this.queue) {
-+                return this.processQueue();
-+            }
-+        }
-+        return false;
-+    }
-+    private boolean processQueue() {
-         try { // Paper - add pending task queue
--        if (this.channel != null && this.channel.isOpen()) {
--            Queue queue = this.queue;
-+        if (this.queue.isEmpty()) return true;
-+        // If we are on main, we are safe here in that nothing else should be processing queue off main anymore
-+        // But if we are not on main due to login/status, the parent is synchronized on packetQueue
-+        java.util.Iterator<PacketHolder> iterator = this.queue.iterator();
-+        while (iterator.hasNext()) {
-+            PacketHolder queued = iterator.next(); // poll -> peek
-+
-+            // Fix NPE (Spigot bug caused by handleDisconnection())
-+            if (queued == null) {
-+                return true;
-+            }
- 
--            synchronized (this.queue) {
--                Connection.PacketHolder networkmanager_queuedpacket;
-+            // Paper start - checking isConsumed flag and skipping packet sending
-+            if (queued.isConsumed()) {
-+                continue;
-+            }
-+            // Paper end - checking isConsumed flag and skipping packet sending
- 
--                while ((networkmanager_queuedpacket = (Connection.PacketHolder) this.queue.poll()) != null) {
--                    this.sendPacket(networkmanager_queuedpacket.packet, networkmanager_queuedpacket.listener);
-+            Packet<?> packet = queued.packet;
-+            if (!packet.isReady()) {
-+                return false;
-+            } else {
-+                iterator.remove();
-+                if (queued.tryMarkConsumed()) { // Paper - try to mark isConsumed flag for de-duplicating packet
-+                    this.sendPacket(packet, queued.listener);
-                 }
--
-             }
-         }
-+        return true;
-         } finally { // Paper start - add pending task queue
-             Runnable r;
-             while ((r = this.pendingTasks.poll()) != null) {
-@@ -320,6 +447,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-             }
-         } // Paper end - add pending task queue
-     }
-+    // Paper end
- 
-     public void tick() {
-         this.flushQueue();
-@@ -356,9 +484,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-         return this.address;
-     }
- 
-+    // Paper start
-+    public void clearPacketQueue() {
-+        net.minecraft.server.level.ServerPlayer player = getPlayer();
-+        queue.forEach(queuedPacket -> {
-+            Packet<?> packet = queuedPacket.packet;
-+            if (packet.hasFinishListener()) {
-+                packet.onPacketDispatchFinish(player, null);
-+            }
-+        });
-+        queue.clear();
-+    }
-+    // Paper end
-     public void disconnect(Component disconnectReason) {
-         // Spigot Start
-         this.preparing = false;
-+        clearPacketQueue(); // Paper
-         // Spigot End
-         if (this.channel == null) {
-             this.delayedDisconnect = disconnectReason;
-@@ -500,7 +641,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-     public void handleDisconnection() {
-         if (this.channel != null && !this.channel.isOpen()) {
-             if (this.disconnectionHandled) {
--                Connection.LOGGER.warn("handleDisconnection() called twice");
-+                //Connection.LOGGER.warn("handleDisconnection() called twice"); // Paper - Do not log useless message
-             } else {
-                 this.disconnectionHandled = true;
-                 if (this.getDisconnectedReason() != null) {
-@@ -508,7 +649,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-                 } else if (this.getPacketListener() != null) {
-                     this.getPacketListener().onDisconnect(Component.translatable("multiplayer.disconnect.generic"));
-                 }
--                this.queue.clear(); // Free up packet queue.
-+                clearPacketQueue(); // Paper
-                 // Paper start - Add PlayerConnectionCloseEvent
-                 final PacketListener packetListener = this.getPacketListener();
-                 if (packetListener instanceof net.minecraft.server.network.ServerGamePacketListenerImpl) {
-@@ -548,6 +689,18 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-         @Nullable
-         final PacketSendListener listener;
- 
-+        // Paper start - isConsumed flag for the connection
-+        private java.util.concurrent.atomic.AtomicBoolean isConsumed = new java.util.concurrent.atomic.AtomicBoolean(false);
-+
-+        public boolean tryMarkConsumed() {
-+            return isConsumed.compareAndSet(false, true);
-+        }
-+
-+        public boolean isConsumed() {
-+            return isConsumed.get();
-+        }
-+        // Paper end - isConsumed flag for the connection
-+
-         public PacketHolder(Packet<?> packet, @Nullable PacketSendListener callbacks) {
-             this.packet = packet;
-             this.listener = callbacks;
-diff --git a/src/main/java/net/minecraft/network/protocol/Packet.java b/src/main/java/net/minecraft/network/protocol/Packet.java
-index 74bfe0d3942259c45702b099efdc4e101a4e3022..e8fcd56906d26f6dc87959e32c4c7c78cfea9658 100644
---- a/src/main/java/net/minecraft/network/protocol/Packet.java
-+++ b/src/main/java/net/minecraft/network/protocol/Packet.java
-@@ -9,6 +9,19 @@ public interface Packet<T extends PacketListener> {
-     void handle(T listener);
- 
-     // Paper start
-+    /**
-+     * @param player Null if not at PLAY stage yet
-+     */
-+    default void onPacketDispatch(@javax.annotation.Nullable net.minecraft.server.level.ServerPlayer player) {}
-+
-+    /**
-+     * @param player Null if not at PLAY stage yet
-+     * @param future Can be null if packet was cancelled
-+     */
-+    default void onPacketDispatchFinish(@javax.annotation.Nullable net.minecraft.server.level.ServerPlayer player, @javax.annotation.Nullable io.netty.channel.ChannelFuture future) {}
-+    default boolean hasFinishListener() { return false; }
-+    default boolean isReady() { return true; }
-+    default java.util.List<Packet> getExtraPackets() { return null; }
-     default boolean packetTooLarge(net.minecraft.network.Connection manager) {
-         return false;
-     }
-diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 776528e50a5abc0e02d9de99231fb47352aa4f43..fbf375534e2b8bd6ef052c4625764f4f8feb2ed6 100644
---- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-+++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -62,10 +62,12 @@ public class ServerConnectionListener {
-     final List<Connection> connections = Collections.synchronizedList(Lists.newArrayList());
-     // Paper start - prevent blocking on adding a new network manager while the server is ticking
-     private final java.util.Queue<Connection> pending = new java.util.concurrent.ConcurrentLinkedQueue<>();
-+    private static final boolean disableFlushConsolidation = Boolean.getBoolean("Paper.disableFlushConsolidate"); // Paper
-     private final void addPending() {
-         Connection manager = null;
-         while ((manager = pending.poll()) != null) {
-             connections.add(manager);
-+            manager.isPending = false;
-         }
-     }
-     // Paper end
-@@ -100,6 +102,7 @@ public class ServerConnectionListener {
-                         ;
-                     }
- 
-+                    if (!disableFlushConsolidation) channel.pipeline().addFirst(new io.netty.handler.flush.FlushConsolidationHandler()); // Paper
-                     ChannelPipeline channelpipeline = channel.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new LegacyQueryHandler(ServerConnectionListener.this));
- 
-                     Connection.configureSerialization(channelpipeline, PacketFlow.SERVERBOUND);