diff --git a/patches/unapplied/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 98% rename from patches/unapplied/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch index ebce2c9397..042c76c15f 100644 --- a/patches/unapplied/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch +++ b/patches/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch @@ -28,7 +28,7 @@ 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 e1eea381a2ebcc32424d31c42a45287d2a1cb16a..ca9a36e357e73b1b518ebb5c937314269655de32 100644 +index 38b3934b4a81972285c1c2bd0297c4458aa08e41..5308f016baf3001ffd1468633cde446493ca581e 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -118,6 +118,10 @@ public class Connection extends SimpleChannelInboundHandler> { @@ -271,7 +271,7 @@ index e1eea381a2ebcc32424d31c42a45287d2a1cb16a..ca9a36e357e73b1b518ebb5c93731426 // Spigot End if (this.channel.isOpen()) { this.channel.close(); // We can't wait as this may be called from an event loop. -@@ -481,7 +622,7 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -484,7 +625,7 @@ public class Connection extends SimpleChannelInboundHandler> { public void handleDisconnection() { if (this.channel != null && !this.channel.isOpen()) { if (this.disconnectionHandled) { @@ -280,7 +280,7 @@ index e1eea381a2ebcc32424d31c42a45287d2a1cb16a..ca9a36e357e73b1b518ebb5c93731426 } else { this.disconnectionHandled = true; if (this.getDisconnectedReason() != null) { -@@ -489,7 +630,7 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -492,7 +633,7 @@ public class Connection extends SimpleChannelInboundHandler> { } else if (this.getPacketListener() != null) { this.getPacketListener().onDisconnect(Component.translatable("multiplayer.disconnect.generic")); } @@ -289,7 +289,7 @@ index e1eea381a2ebcc32424d31c42a45287d2a1cb16a..ca9a36e357e73b1b518ebb5c93731426 // Paper start - Add PlayerConnectionCloseEvent final PacketListener packetListener = this.getPacketListener(); if (packetListener instanceof net.minecraft.server.network.ServerGamePacketListenerImpl) { -@@ -529,6 +670,18 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -532,6 +673,18 @@ public class Connection extends SimpleChannelInboundHandler> { @Nullable final PacketSendListener listener; diff --git a/patches/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0299-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from patches/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/server/0299-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/patches/server/0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0300-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/server/0300-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/0300-Entity-getEntitySpawnReason.patch b/patches/server/0301-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/server/0300-Entity-getEntitySpawnReason.patch rename to patches/server/0301-Entity-getEntitySpawnReason.patch diff --git a/patches/server/0301-Fire-event-on-GS4-query.patch b/patches/server/0302-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0301-Fire-event-on-GS4-query.patch rename to patches/server/0302-Fire-event-on-GS4-query.patch diff --git a/patches/server/0302-Implement-PlayerPostRespawnEvent.patch b/patches/server/0303-Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/0302-Implement-PlayerPostRespawnEvent.patch rename to patches/server/0303-Implement-PlayerPostRespawnEvent.patch diff --git a/patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/server/0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/0304-Server-Tick-Events.patch b/patches/server/0305-Server-Tick-Events.patch similarity index 100% rename from patches/server/0304-Server-Tick-Events.patch rename to patches/server/0305-Server-Tick-Events.patch diff --git a/patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0306-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch rename to patches/server/0306-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0307-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch rename to patches/server/0307-Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/0307-Add-Heightmap-API.patch b/patches/server/0308-Add-Heightmap-API.patch similarity index 100% rename from patches/server/0307-Add-Heightmap-API.patch rename to patches/server/0308-Add-Heightmap-API.patch diff --git a/patches/server/0308-Mob-Spawner-API-Enhancements.patch b/patches/server/0309-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/0308-Mob-Spawner-API-Enhancements.patch rename to patches/server/0309-Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0311-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/server/0311-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0311-Implement-CraftBlockSoundGroup.patch b/patches/server/0312-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0311-Implement-CraftBlockSoundGroup.patch rename to patches/server/0312-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 100% rename from patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/server/0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0314-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0314-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0314-Expose-the-internal-current-tick.patch b/patches/server/0315-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0314-Expose-the-internal-current-tick.patch rename to patches/server/0315-Expose-the-internal-current-tick.patch diff --git a/patches/server/0315-Fix-World-isChunkGenerated-calls.patch b/patches/server/0316-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0315-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0316-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0317-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/server/0317-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/server/0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0318-Configurable-projectile-relative-velocity.patch b/patches/server/0319-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0318-Configurable-projectile-relative-velocity.patch rename to patches/server/0319-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0319-offset-item-frame-ticking.patch b/patches/server/0320-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0319-offset-item-frame-ticking.patch rename to patches/server/0320-offset-item-frame-ticking.patch diff --git a/patches/server/0320-Fix-MC-158900.patch b/patches/server/0321-Fix-MC-158900.patch similarity index 100% rename from patches/server/0320-Fix-MC-158900.patch rename to patches/server/0321-Fix-MC-158900.patch diff --git a/patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0322-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0322-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0322-Dont-send-unnecessary-sign-update.patch b/patches/server/0323-Dont-send-unnecessary-sign-update.patch similarity index 100% rename from patches/server/0322-Dont-send-unnecessary-sign-update.patch rename to patches/server/0323-Dont-send-unnecessary-sign-update.patch diff --git a/patches/server/0323-Add-option-to-disable-pillager-patrols.patch b/patches/server/0324-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0323-Add-option-to-disable-pillager-patrols.patch rename to patches/server/0324-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0324-Flat-bedrock-generator-settings.patch b/patches/server/0325-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0324-Flat-bedrock-generator-settings.patch rename to patches/server/0325-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0326-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/server/0326-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0327-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/server/0327-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0327-Duplicate-UUID-Resolve-Option.patch b/patches/server/0328-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0327-Duplicate-UUID-Resolve-Option.patch rename to patches/server/0328-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0329-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0329-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0331-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0331-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0332-Optimise-EntityGetter-getPlayerByUUID.patch similarity index 100% rename from patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/server/0332-Optimise-EntityGetter-getPlayerByUUID.patch diff --git a/patches/server/0332-Fix-items-not-falling-correctly.patch b/patches/server/0333-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0332-Fix-items-not-falling-correctly.patch rename to patches/server/0333-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0334-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0334-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0335-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/server/0335-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0335-Entity-Activation-Range-2.0.patch b/patches/server/0336-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0335-Entity-Activation-Range-2.0.patch rename to patches/server/0336-Entity-Activation-Range-2.0.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-Tracking-Range-Improvements.patch b/patches/server/0338-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0337-Tracking-Range-Improvements.patch rename to patches/server/0338-Tracking-Range-Improvements.patch diff --git a/patches/server/0338-Fix-items-vanishing-through-end-portal.patch b/patches/server/0339-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/0338-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0339-Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/0339-implement-optional-per-player-mob-spawns.patch b/patches/server/0340-implement-optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0339-implement-optional-per-player-mob-spawns.patch rename to patches/server/0340-implement-optional-per-player-mob-spawns.patch diff --git a/patches/server/0340-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0341-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0340-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0341-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0341-Improve-Block-breakNaturally-API.patch b/patches/server/0342-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/0341-Improve-Block-breakNaturally-API.patch rename to patches/server/0342-Improve-Block-breakNaturally-API.patch diff --git a/patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0343-Add-debug-for-sync-chunk-loads.patch b/patches/server/0344-Add-debug-for-sync-chunk-loads.patch similarity index 100% rename from patches/server/0343-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0344-Add-debug-for-sync-chunk-loads.patch diff --git a/patches/server/0344-Remove-garbage-Java-version-check.patch b/patches/server/0345-Remove-garbage-Java-version-check.patch similarity index 100% rename from patches/server/0344-Remove-garbage-Java-version-check.patch rename to patches/server/0345-Remove-garbage-Java-version-check.patch diff --git a/patches/server/0345-Add-ThrownEggHatchEvent.patch b/patches/server/0346-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0345-Add-ThrownEggHatchEvent.patch rename to patches/server/0346-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0346-Entity-Jump-API.patch b/patches/server/0347-Entity-Jump-API.patch similarity index 100% rename from patches/server/0346-Entity-Jump-API.patch rename to patches/server/0347-Entity-Jump-API.patch diff --git a/patches/server/0347-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0348-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0347-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0348-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0348-Make-the-GUI-graph-fancier.patch b/patches/server/0349-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0348-Make-the-GUI-graph-fancier.patch rename to patches/server/0349-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0349-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0350-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0349-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0350-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0350-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0351-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0350-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0351-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0351-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0352-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0351-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0352-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0352-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0353-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0352-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0353-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0353-Optimise-Chunk-getFluid.patch b/patches/server/0354-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0353-Optimise-Chunk-getFluid.patch rename to patches/server/0354-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0354-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0355-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0354-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0355-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0355-Add-tick-times-API-and-mspt-command.patch b/patches/server/0356-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0355-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0356-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0356-Expose-MinecraftServer-isRunning.patch b/patches/server/0357-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0356-Expose-MinecraftServer-isRunning.patch rename to patches/server/0357-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0357-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0358-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0357-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0358-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0358-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0359-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from patches/server/0358-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0359-Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0360-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0360-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0360-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0361-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0360-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0361-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0362-Don-t-tick-dead-players.patch b/patches/server/0363-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0362-Don-t-tick-dead-players.patch rename to patches/server/0363-Don-t-tick-dead-players.patch diff --git a/patches/server/0363-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0364-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0363-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0364-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0364-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0365-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0364-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0365-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0365-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0365-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0367-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0367-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0367-Improved-Watchdog-Support.patch b/patches/server/0368-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/0367-Improved-Watchdog-Support.patch rename to patches/server/0368-Improved-Watchdog-Support.patch diff --git a/patches/server/0368-Optimize-Pathfinding.patch b/patches/server/0369-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0368-Optimize-Pathfinding.patch rename to patches/server/0369-Optimize-Pathfinding.patch diff --git a/patches/server/0369-Reduce-Either-Optional-allocation.patch b/patches/server/0370-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0369-Reduce-Either-Optional-allocation.patch rename to patches/server/0370-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0371-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0371-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0371-Prevent-opening-inventories-when-frozen.patch b/patches/server/0372-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0371-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0372-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0372-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0373-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0372-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0373-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0373-Implement-Player-Client-Options-API.patch b/patches/server/0374-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0373-Implement-Player-Client-Options-API.patch rename to patches/server/0374-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0374-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0375-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0374-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0375-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/0376-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0376-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0377-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0378-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0377-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0378-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0378-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0379-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0378-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0379-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0379-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0380-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0379-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0380-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0380-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from patches/server/0380-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/patches/server/0381-Villager-Restocks-API.patch b/patches/server/0382-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0381-Villager-Restocks-API.patch rename to patches/server/0382-Villager-Restocks-API.patch diff --git a/patches/server/0382-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0382-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0383-Expose-game-version.patch b/patches/server/0384-Expose-game-version.patch similarity index 100% rename from patches/server/0383-Expose-game-version.patch rename to patches/server/0384-Expose-game-version.patch diff --git a/patches/server/0384-Optimize-Voxel-Shape-Merging.patch b/patches/server/0385-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0384-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0385-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0385-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0386-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0385-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0386-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0386-misc-debugging-dumps.patch b/patches/server/0387-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0386-misc-debugging-dumps.patch rename to patches/server/0387-misc-debugging-dumps.patch diff --git a/patches/server/0387-Prevent-teleporting-dead-entities.patch b/patches/server/0388-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0387-Prevent-teleporting-dead-entities.patch rename to patches/server/0388-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 99% rename from patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index 9ce564d681..11b5dc9765 100644 --- a/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -474,7 +474,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 38b3934b4a81972285c1c2bd0297c4458aa08e41..077950ba6da2af1afc6edbf4449b37fb0893088a 100644 +index 5308f016baf3001ffd1468633cde446493ca581e..1b6d090afea5b0a49b601b73cefeedc0b832ba9d 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -64,13 +64,13 @@ public class Connection extends SimpleChannelInboundHandler> { @@ -494,7 +494,7 @@ index 38b3934b4a81972285c1c2bd0297c4458aa08e41..077950ba6da2af1afc6edbf4449b37fb }); private final PacketFlow receiving; private final Queue queue = Queues.newConcurrentLinkedQueue(); -@@ -194,7 +194,7 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -199,7 +199,7 @@ public class Connection extends SimpleChannelInboundHandler> { } } @@ -540,7 +540,7 @@ index 4a8d4c92ba97d224d8ccd6a9232623ec66ef40a9..e065a559a0ccccf76c27bc4651370164 } // Paper end diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -index 776528e50a5abc0e02d9de99231fb47352aa4f43..4017c15a62ce1048a61f55f46f915fd516496181 100644 +index fbf375534e2b8bd6ef052c4625764f4f8feb2ed6..bb9e65eee7e0ca0f715cd5791c47579a57b1b577 100644 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java @@ -51,10 +51,10 @@ public class ServerConnectionListener { diff --git a/patches/server/0389-Implement-Mob-Goal-API.patch b/patches/server/0390-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0389-Implement-Mob-Goal-API.patch rename to patches/server/0390-Implement-Mob-Goal-API.patch diff --git a/patches/server/0390-Add-villager-reputation-API.patch b/patches/server/0391-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0390-Add-villager-reputation-API.patch rename to patches/server/0391-Add-villager-reputation-API.patch diff --git a/patches/server/0391-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0392-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0391-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0392-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0392-ExperienceOrbMergeEvent.patch b/patches/server/0393-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0392-ExperienceOrbMergeEvent.patch rename to patches/server/0393-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0393-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0394-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0393-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0394-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0394-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0395-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0394-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0395-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0395-Potential-bed-API.patch b/patches/server/0396-Potential-bed-API.patch similarity index 100% rename from patches/server/0395-Potential-bed-API.patch rename to patches/server/0396-Potential-bed-API.patch diff --git a/patches/server/0396-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0397-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0396-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0397-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0397-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0398-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0397-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0398-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0398-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0398-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0399-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0400-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0399-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0400-Reduce-allocation-of-Vec3D-by-entity-tracker.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-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0424-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0423-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/server/0424-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0425-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0425-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0425-Remove-some-streams-from-structures.patch b/patches/server/0426-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0425-Remove-some-streams-from-structures.patch rename to patches/server/0426-Remove-some-streams-from-structures.patch diff --git a/patches/server/0426-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0427-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0426-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0427-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0427-Support-components-in-ItemMeta.patch b/patches/server/0428-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0427-Support-components-in-ItemMeta.patch rename to patches/server/0428-Support-components-in-ItemMeta.patch diff --git a/patches/server/0428-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0429-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0428-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0429-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0429-Add-entity-liquid-API.patch b/patches/server/0430-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0429-Add-entity-liquid-API.patch rename to patches/server/0430-Add-entity-liquid-API.patch diff --git a/patches/server/0430-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0431-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0430-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0431-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0431-Spawn-player-in-correct-world-on-login.patch b/patches/server/0432-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0431-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0432-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0432-Add-PrepareResultEvent.patch b/patches/server/0433-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0432-Add-PrepareResultEvent.patch rename to patches/server/0433-Add-PrepareResultEvent.patch diff --git a/patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0434-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0435-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0434-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0435-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0435-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0436-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0435-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0436-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0437-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0437-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0437-Fix-SPIGOT-5989.patch b/patches/server/0438-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0437-Fix-SPIGOT-5989.patch rename to patches/server/0438-Fix-SPIGOT-5989.patch diff --git a/patches/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0439-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0439-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0440-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0440-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0441-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0441-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0441-Fix-some-rails-connecting-improperly.patch b/patches/server/0442-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0441-Fix-some-rails-connecting-improperly.patch rename to patches/server/0442-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0443-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0444-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0443-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0444-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0444-Brand-support.patch b/patches/server/0445-Brand-support.patch similarity index 100% rename from patches/server/0444-Brand-support.patch rename to patches/server/0445-Brand-support.patch diff --git a/patches/server/0445-Add-setMaxPlayers-API.patch b/patches/server/0446-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0445-Add-setMaxPlayers-API.patch rename to patches/server/0446-Add-setMaxPlayers-API.patch diff --git a/patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0447-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0447-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0447-Don-t-require-FACING-data.patch b/patches/server/0448-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0447-Don-t-require-FACING-data.patch rename to patches/server/0448-Don-t-require-FACING-data.patch diff --git a/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0449-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0449-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0449-Add-moon-phase-API.patch b/patches/server/0450-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0449-Add-moon-phase-API.patch rename to patches/server/0450-Add-moon-phase-API.patch diff --git a/patches/server/0450-Prevent-headless-pistons-from-being-created.patch b/patches/server/0451-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0450-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0451-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0451-Add-BellRingEvent.patch b/patches/server/0452-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0451-Add-BellRingEvent.patch rename to patches/server/0452-Add-BellRingEvent.patch diff --git a/patches/server/0452-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0453-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0452-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0453-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0453-Buffer-joins-to-world.patch b/patches/server/0454-Buffer-joins-to-world.patch similarity index 90% rename from patches/server/0453-Buffer-joins-to-world.patch rename to patches/server/0454-Buffer-joins-to-world.patch index 9ed5bad08e..8c45d682cf 100644 --- a/patches/server/0453-Buffer-joins-to-world.patch +++ b/patches/server/0454-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 077950ba6da2af1afc6edbf4449b37fb0893088a..805f15a6236088894d75904ae190f987131d943a 100644 +index 1b6d090afea5b0a49b601b73cefeedc0b832ba9d..ee8d1bb909cf2a3bbe3434aa085762d952198063 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java -@@ -315,14 +315,29 @@ public class Connection extends SimpleChannelInboundHandler> { - } // Paper end - add pending task queue +@@ -443,14 +443,29 @@ public class Connection extends SimpleChannelInboundHandler> { } + // Paper end + 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/0454-Eigencraft-redstone-implementation.patch b/patches/server/0455-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0454-Eigencraft-redstone-implementation.patch rename to patches/server/0455-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0456-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0456-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0457-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0457-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0457-Fix-CraftTeam-null-check.patch b/patches/server/0458-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0457-Fix-CraftTeam-null-check.patch rename to patches/server/0458-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0458-Add-more-Evoker-API.patch b/patches/server/0459-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0458-Add-more-Evoker-API.patch rename to patches/server/0459-Add-more-Evoker-API.patch diff --git a/patches/server/0459-Add-methods-to-get-translation-keys.patch b/patches/server/0460-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0459-Add-methods-to-get-translation-keys.patch rename to patches/server/0460-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0461-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0461-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0461-Cache-block-data-strings.patch b/patches/server/0462-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0461-Cache-block-data-strings.patch rename to patches/server/0462-Cache-block-data-strings.patch diff --git a/patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0463-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0463-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0464-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0464-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0465-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0465-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0466-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0466-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0466-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0467-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0466-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0467-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0468-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0468-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0468-Entity-isTicking.patch b/patches/server/0469-Entity-isTicking.patch similarity index 100% rename from patches/server/0468-Entity-isTicking.patch rename to patches/server/0469-Entity-isTicking.patch diff --git a/patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0471-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0471-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0472-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0472-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0473-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0473-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0473-Optimise-getType-calls.patch b/patches/server/0474-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0473-Optimise-getType-calls.patch rename to patches/server/0474-Optimise-getType-calls.patch diff --git a/patches/server/0474-Villager-resetOffers.patch b/patches/server/0475-Villager-resetOffers.patch similarity index 100% rename from patches/server/0474-Villager-resetOffers.patch rename to patches/server/0475-Villager-resetOffers.patch diff --git a/patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0476-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0476-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0477-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0477-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0477-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0478-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0477-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0478-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0478-Player-elytra-boost-API.patch b/patches/server/0479-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0478-Player-elytra-boost-API.patch rename to patches/server/0479-Player-elytra-boost-API.patch diff --git a/patches/server/0479-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0480-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0479-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0480-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0481-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0481-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0481-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0482-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0481-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0482-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0482-Add-ignore-discounts-API.patch b/patches/server/0483-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0482-Add-ignore-discounts-API.patch rename to patches/server/0483-Add-ignore-discounts-API.patch diff --git a/patches/server/0483-Toggle-for-removing-existing-dragon.patch b/patches/server/0484-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0483-Toggle-for-removing-existing-dragon.patch rename to patches/server/0484-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0484-Fix-client-lag-on-advancement-loading.patch b/patches/server/0485-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0484-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0485-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0485-Item-no-age-no-player-pickup.patch b/patches/server/0486-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0485-Item-no-age-no-player-pickup.patch rename to patches/server/0486-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0487-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0487-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0487-Beacon-API-custom-effect-ranges.patch b/patches/server/0488-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0487-Beacon-API-custom-effect-ranges.patch rename to patches/server/0488-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0488-Add-API-for-quit-reason.patch b/patches/server/0489-Add-API-for-quit-reason.patch similarity index 86% rename from patches/server/0488-Add-API-for-quit-reason.patch rename to patches/server/0489-Add-API-for-quit-reason.patch index 549fdfdbf8..2f07e823ec 100644 --- a/patches/server/0488-Add-API-for-quit-reason.patch +++ b/patches/server/0489-Add-API-for-quit-reason.patch @@ -5,28 +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 805f15a6236088894d75904ae190f987131d943a..1f8bb1481a0ed8b69cdf01335e159088c1a4f553 100644 +index ee8d1bb909cf2a3bbe3434aa085762d952198063..f8ffc5238320d2c665d80adb1ad3786c86eef968 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java -@@ -124,6 +124,17 @@ public class Connection extends SimpleChannelInboundHandler> { - this.receiving = side; - } - -+ // Paper start -+ @Nullable -+ public net.minecraft.server.level.ServerPlayer getPlayer() { -+ if (this.packetListener instanceof net.minecraft.server.network.ServerGamePacketListenerImpl serverGamePacketListener) { -+ return serverGamePacketListener.player; -+ } else { -+ return null; -+ } -+ } -+ // Paper end -+ - public void channelActive(ChannelHandlerContext channelhandlercontext) throws Exception { - super.channelActive(channelhandlercontext); - this.channel = channelhandlercontext.channel(); -@@ -171,12 +182,15 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -176,12 +176,15 @@ public class Connection extends SimpleChannelInboundHandler> { this.handlingFault = true; if (this.channel.isOpen()) { diff --git a/patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0490-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0490-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0490-Expose-world-spawn-angle.patch b/patches/server/0491-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0490-Expose-world-spawn-angle.patch rename to patches/server/0491-Expose-world-spawn-angle.patch diff --git a/patches/server/0491-Add-Destroy-Speed-API.patch b/patches/server/0492-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0491-Add-Destroy-Speed-API.patch rename to patches/server/0492-Add-Destroy-Speed-API.patch diff --git a/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0493-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0493-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0493-Add-LivingEntity-clearActiveItem.patch b/patches/server/0494-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0493-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0494-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0494-Add-PlayerItemCooldownEvent.patch b/patches/server/0495-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0494-Add-PlayerItemCooldownEvent.patch rename to patches/server/0495-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0496-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0496-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0496-More-lightning-API.patch b/patches/server/0497-More-lightning-API.patch similarity index 100% rename from patches/server/0496-More-lightning-API.patch rename to patches/server/0497-More-lightning-API.patch diff --git a/patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0498-Added-missing-default-perms-for-commands.patch b/patches/server/0499-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0498-Added-missing-default-perms-for-commands.patch rename to patches/server/0499-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0499-Add-PlayerShearBlockEvent.patch b/patches/server/0500-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0499-Add-PlayerShearBlockEvent.patch rename to patches/server/0500-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0501-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0501-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0501-Limit-recipe-packets.patch b/patches/server/0502-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0501-Limit-recipe-packets.patch rename to patches/server/0502-Limit-recipe-packets.patch diff --git a/patches/server/0502-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0503-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0502-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0503-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0503-Player-Chunk-Load-Unload-Events.patch b/patches/server/0504-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0503-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0504-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0505-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0505-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0505-Expose-LivingEntity-hurt-direction.patch b/patches/server/0506-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0505-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0506-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0507-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0507-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0508-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0508-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0509-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0509-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0509-Implement-TargetHitEvent.patch b/patches/server/0510-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0509-Implement-TargetHitEvent.patch rename to patches/server/0510-Implement-TargetHitEvent.patch diff --git a/patches/server/0510-MC-4-Fix-item-position-desync.patch b/patches/server/0511-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0510-MC-4-Fix-item-position-desync.patch rename to patches/server/0511-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0511-Additional-Block-Material-API-s.patch b/patches/server/0512-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0511-Additional-Block-Material-API-s.patch rename to patches/server/0512-Additional-Block-Material-API-s.patch diff --git a/patches/server/0512-Fix-harming-potion-dupe.patch b/patches/server/0513-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0512-Fix-harming-potion-dupe.patch rename to patches/server/0513-Fix-harming-potion-dupe.patch diff --git a/patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0514-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0514-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0514-Cache-burn-durations.patch b/patches/server/0515-Cache-burn-durations.patch similarity index 100% rename from patches/server/0514-Cache-burn-durations.patch rename to patches/server/0515-Cache-burn-durations.patch diff --git a/patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0516-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0516-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0517-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0517-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0518-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0518-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0518-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0519-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0518-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0519-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0519-Zombie-API-breaking-doors.patch b/patches/server/0520-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0519-Zombie-API-breaking-doors.patch rename to patches/server/0520-Zombie-API-breaking-doors.patch diff --git a/patches/server/0520-Fix-nerfed-slime-when-splitting.patch b/patches/server/0521-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0520-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0521-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0521-Add-EntityLoadCrossbowEvent.patch b/patches/server/0522-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0521-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0522-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0522-Added-WorldGameRuleChangeEvent.patch b/patches/server/0523-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0522-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0523-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0523-Added-ServerResourcesReloadedEvent.patch b/patches/server/0524-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0523-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0524-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0525-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0525-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0525-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0526-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0525-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0526-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0526-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0527-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0526-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0527-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0528-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0528-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0528-Configurable-door-breaking-difficulty.patch b/patches/server/0529-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0528-Configurable-door-breaking-difficulty.patch rename to patches/server/0529-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0529-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0530-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0529-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0530-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0530-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0531-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0530-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0531-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0531-Remove-stale-POIs.patch b/patches/server/0532-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0531-Remove-stale-POIs.patch rename to patches/server/0532-Remove-stale-POIs.patch diff --git a/patches/server/0532-Fix-villager-boat-exploit.patch b/patches/server/0533-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0532-Fix-villager-boat-exploit.patch rename to patches/server/0533-Fix-villager-boat-exploit.patch diff --git a/patches/server/0533-Add-sendOpLevel-API.patch b/patches/server/0534-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0533-Add-sendOpLevel-API.patch rename to patches/server/0534-Add-sendOpLevel-API.patch diff --git a/patches/server/0534-TODO-Registry-Modification-API.patch b/patches/server/0535-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0534-TODO-Registry-Modification-API.patch rename to patches/server/0535-TODO-Registry-Modification-API.patch diff --git a/patches/server/0535-Add-StructuresLocateEvent.patch b/patches/server/0536-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0535-Add-StructuresLocateEvent.patch rename to patches/server/0536-Add-StructuresLocateEvent.patch diff --git a/patches/server/0536-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0537-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0536-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0537-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0537-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0538-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0537-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0538-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0538-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0539-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0538-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0539-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0539-Make-schedule-command-per-world.patch b/patches/server/0540-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0539-Make-schedule-command-per-world.patch rename to patches/server/0540-Make-schedule-command-per-world.patch diff --git a/patches/server/0540-Configurable-max-leash-distance.patch b/patches/server/0541-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0540-Configurable-max-leash-distance.patch rename to patches/server/0541-Configurable-max-leash-distance.patch diff --git a/patches/server/0541-Implement-BlockPreDispenseEvent.patch b/patches/server/0542-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0541-Implement-BlockPreDispenseEvent.patch rename to patches/server/0542-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0542-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0543-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0542-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0543-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0543-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0544-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0543-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0544-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0544-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0545-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0544-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0545-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0545-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0545-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0546-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0547-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0546-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0547-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0547-add-DragonEggFormEvent.patch b/patches/server/0548-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0547-add-DragonEggFormEvent.patch rename to patches/server/0548-add-DragonEggFormEvent.patch diff --git a/patches/server/0548-EntityMoveEvent.patch b/patches/server/0549-EntityMoveEvent.patch similarity index 100% rename from patches/server/0548-EntityMoveEvent.patch rename to patches/server/0549-EntityMoveEvent.patch diff --git a/patches/server/0549-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0550-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0549-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0550-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0550-Inline-shift-direction-fields.patch b/patches/server/0551-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0550-Inline-shift-direction-fields.patch rename to patches/server/0551-Inline-shift-direction-fields.patch diff --git a/patches/server/0551-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0552-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0551-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0552-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0552-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0553-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0552-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0553-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0553-living-entity-allow-attribute-registration.patch b/patches/server/0554-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0553-living-entity-allow-attribute-registration.patch rename to patches/server/0554-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0554-fix-dead-slime-setSize-invincibility.patch b/patches/server/0555-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0554-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0555-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0555-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0556-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0555-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0556-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0556-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0557-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0556-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0557-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0557-Expose-Tracked-Players.patch b/patches/server/0558-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0557-Expose-Tracked-Players.patch rename to patches/server/0558-Expose-Tracked-Players.patch diff --git a/patches/server/0558-Remove-streams-from-SensorNearest.patch b/patches/server/0559-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0558-Remove-streams-from-SensorNearest.patch rename to patches/server/0559-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0559-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0560-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0559-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0560-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0560-Improve-ServerGUI.patch b/patches/server/0561-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0560-Improve-ServerGUI.patch rename to patches/server/0561-Improve-ServerGUI.patch diff --git a/patches/server/0561-fix-converting-txt-to-json-file.patch b/patches/server/0562-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0561-fix-converting-txt-to-json-file.patch rename to patches/server/0562-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0562-Add-worldborder-events.patch b/patches/server/0563-Add-worldborder-events.patch similarity index 100% rename from patches/server/0562-Add-worldborder-events.patch rename to patches/server/0563-Add-worldborder-events.patch diff --git a/patches/server/0563-added-PlayerNameEntityEvent.patch b/patches/server/0564-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0563-added-PlayerNameEntityEvent.patch rename to patches/server/0564-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0564-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0565-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0564-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0565-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0565-Add-recipe-to-cook-events.patch b/patches/server/0566-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0565-Add-recipe-to-cook-events.patch rename to patches/server/0566-Add-recipe-to-cook-events.patch diff --git a/patches/server/0566-Add-Block-isValidTool.patch b/patches/server/0567-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0566-Add-Block-isValidTool.patch rename to patches/server/0567-Add-Block-isValidTool.patch diff --git a/patches/server/0567-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0568-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0567-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0568-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0568-Expand-world-key-API.patch b/patches/server/0569-Expand-world-key-API.patch similarity index 100% rename from patches/server/0568-Expand-world-key-API.patch rename to patches/server/0569-Expand-world-key-API.patch diff --git a/patches/server/0569-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0570-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0569-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0570-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0570-Item-Rarity-API.patch b/patches/server/0571-Item-Rarity-API.patch similarity index 100% rename from patches/server/0570-Item-Rarity-API.patch rename to patches/server/0571-Item-Rarity-API.patch diff --git a/patches/server/0571-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0572-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0571-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0572-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0572-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0573-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0572-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0573-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0574-Expose-protocol-version.patch b/patches/server/0575-Expose-protocol-version.patch similarity index 100% rename from patches/server/0574-Expose-protocol-version.patch rename to patches/server/0575-Expose-protocol-version.patch diff --git a/patches/server/0575-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0576-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0575-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0576-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0576-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0576-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0577-Add-bypass-host-check.patch b/patches/server/0578-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0577-Add-bypass-host-check.patch rename to patches/server/0578-Add-bypass-host-check.patch diff --git a/patches/server/0578-Set-area-affect-cloud-rotation.patch b/patches/server/0579-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0578-Set-area-affect-cloud-rotation.patch rename to patches/server/0579-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0579-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0580-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0579-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0580-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0580-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0581-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0580-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0581-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0581-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0582-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0581-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0582-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0582-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0583-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0582-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0583-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0584-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0584-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0584-Added-PlayerDeepSleepEvent.patch b/patches/server/0585-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0584-Added-PlayerDeepSleepEvent.patch rename to patches/server/0585-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0585-More-World-API.patch b/patches/server/0586-More-World-API.patch similarity index 100% rename from patches/server/0585-More-World-API.patch rename to patches/server/0586-More-World-API.patch diff --git a/patches/server/0586-Added-PlayerBedFailEnterEvent.patch b/patches/server/0587-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0586-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0587-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0587-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0587-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0588-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0588-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0589-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0590-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0589-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0590-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0590-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0590-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0591-Add-Channel-initialization-listeners.patch b/patches/server/0592-Add-Channel-initialization-listeners.patch similarity index 94% rename from patches/server/0591-Add-Channel-initialization-listeners.patch rename to patches/server/0592-Add-Channel-initialization-listeners.patch index cd80c77b12..efd683b7d1 100644 --- a/patches/server/0591-Add-Channel-initialization-listeners.patch +++ b/patches/server/0592-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 1f8bb1481a0ed8b69cdf01335e159088c1a4f553..358b41541284392f9a7a0ef3156e8adc8c005cc4 100644 +index f8ffc5238320d2c665d80adb1ad3786c86eef968..1a6326ce5160b18ecbef26d719b0a207ccad2783 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java -@@ -498,6 +498,7 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -628,6 +628,7 @@ public class Connection extends SimpleChannelInboundHandler> { } else { this.channel.pipeline().addBefore("encoder", "compress", new CompressionEncoder(compressionThreshold)); } @@ -133,7 +133,7 @@ index 1f8bb1481a0ed8b69cdf01335e159088c1a4f553..358b41541284392f9a7a0ef3156e8adc } else { if (this.channel.pipeline().get("decompress") instanceof CompressionDecoder) { this.channel.pipeline().remove("decompress"); -@@ -506,6 +507,7 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -636,6 +637,7 @@ public class Connection extends SimpleChannelInboundHandler> { if (this.channel.pipeline().get("compress") instanceof CompressionEncoder) { this.channel.pipeline().remove("compress"); } @@ -142,10 +142,10 @@ index 1f8bb1481a0ed8b69cdf01335e159088c1a4f553..358b41541284392f9a7a0ef3156e8adc } diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -index 4017c15a62ce1048a61f55f46f915fd516496181..deda8fca63fc1ed71d3c309d403167fa17a509a9 100644 +index bb9e65eee7e0ca0f715cd5791c47579a57b1b577..29a0a720f22f56ca3d844efef1ecde3980fb1c12 100644 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -@@ -110,6 +110,7 @@ public class ServerConnectionListener { +@@ -113,6 +113,7 @@ public class ServerConnectionListener { pending.add(object); // Paper channelpipeline.addLast("packet_handler", (ChannelHandler) object); ((Connection) object).setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object)); diff --git a/patches/server/0592-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0592-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0593-Add-more-WanderingTrader-API.patch b/patches/server/0594-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0593-Add-more-WanderingTrader-API.patch rename to patches/server/0594-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0594-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0595-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0594-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0595-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0595-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0595-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0596-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0596-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0597-Inventory-close.patch b/patches/server/0598-Inventory-close.patch similarity index 100% rename from patches/server/0597-Inventory-close.patch rename to patches/server/0598-Inventory-close.patch diff --git a/patches/server/0598-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0598-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0599-Fix-CraftPotionBrewer-cache.patch b/patches/server/0600-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0599-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0600-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0600-Add-basic-Datapack-API.patch b/patches/server/0601-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0600-Add-basic-Datapack-API.patch rename to patches/server/0601-Add-basic-Datapack-API.patch diff --git a/patches/server/0601-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0602-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0601-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0602-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0602-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0602-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0603-ItemStack-repair-check-API.patch b/patches/server/0604-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0603-ItemStack-repair-check-API.patch rename to patches/server/0604-ItemStack-repair-check-API.patch diff --git a/patches/server/0604-More-Enchantment-API.patch b/patches/server/0605-More-Enchantment-API.patch similarity index 100% rename from patches/server/0604-More-Enchantment-API.patch rename to patches/server/0605-More-Enchantment-API.patch diff --git a/patches/server/0605-Move-range-check-for-block-placing-up.patch b/patches/server/0606-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0605-Move-range-check-for-block-placing-up.patch rename to patches/server/0606-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0606-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0607-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0606-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0607-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0607-Add-Mob-lookAt-API.patch b/patches/server/0608-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0607-Add-Mob-lookAt-API.patch rename to patches/server/0608-Add-Mob-lookAt-API.patch diff --git a/patches/server/0608-Add-Unix-domain-socket-support.patch b/patches/server/0609-Add-Unix-domain-socket-support.patch similarity index 97% rename from patches/server/0608-Add-Unix-domain-socket-support.patch rename to patches/server/0609-Add-Unix-domain-socket-support.patch index cb9ada4e1b..1d2d20bc63 100644 --- a/patches/server/0608-Add-Unix-domain-socket-support.patch +++ b/patches/server/0609-Add-Unix-domain-socket-support.patch @@ -53,10 +53,10 @@ index 91ed7311d365c9134c9a2598ca5ed9f94263b6e9..4757d6432631f0c5379597b40fda169a 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 deda8fca63fc1ed71d3c309d403167fa17a509a9..d86830ea180bebb409fc20ed43dd25cd0856f623 100644 +index 29a0a720f22f56ca3d844efef1ecde3980fb1c12..838244e3680ea6020701e10bafbde7f52976eaa1 100644 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -@@ -75,7 +75,12 @@ public class ServerConnectionListener { +@@ -77,7 +77,12 @@ public class ServerConnectionListener { this.running = true; } @@ -69,7 +69,7 @@ index deda8fca63fc1ed71d3c309d403167fa17a509a9..d86830ea180bebb409fc20ed43dd25cd List list = this.channels; synchronized (this.channels) { -@@ -83,7 +88,11 @@ public class ServerConnectionListener { +@@ -85,7 +90,11 @@ public class ServerConnectionListener { LazyLoadedValue lazyinitvar; if (Epoll.isAvailable() && this.server.isEpollEnabled()) { @@ -81,7 +81,7 @@ index deda8fca63fc1ed71d3c309d403167fa17a509a9..d86830ea180bebb409fc20ed43dd25cd lazyinitvar = ServerConnectionListener.SERVER_EPOLL_EVENT_GROUP; ServerConnectionListener.LOGGER.info("Using epoll channel type"); } else { -@@ -112,7 +121,7 @@ public class ServerConnectionListener { +@@ -115,7 +124,7 @@ public class ServerConnectionListener { ((Connection) object).setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object)); io.papermc.paper.network.ChannelInitializeListenerHolder.callListeners(channel); // Paper } diff --git a/patches/server/0609-Add-EntityInsideBlockEvent.patch b/patches/server/0610-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0609-Add-EntityInsideBlockEvent.patch rename to patches/server/0610-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0610-Attributes-API-for-item-defaults.patch b/patches/server/0611-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0610-Attributes-API-for-item-defaults.patch rename to patches/server/0611-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0611-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0611-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0612-More-Lidded-Block-API.patch b/patches/server/0613-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0612-More-Lidded-Block-API.patch rename to patches/server/0613-More-Lidded-Block-API.patch diff --git a/patches/server/0613-Limit-item-frame-cursors-on-maps.patch b/patches/server/0614-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0613-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0614-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0614-Add-PlayerKickEvent-causes.patch b/patches/server/0615-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0614-Add-PlayerKickEvent-causes.patch rename to patches/server/0615-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0615-Add-PufferFishStateChangeEvent.patch b/patches/server/0616-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0615-Add-PufferFishStateChangeEvent.patch rename to patches/server/0616-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0616-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0616-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0617-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0617-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0618-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0618-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0619-Add-BellRevealRaiderEvent.patch b/patches/server/0620-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0619-Add-BellRevealRaiderEvent.patch rename to patches/server/0620-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0620-Fix-invulnerable-end-crystals.patch b/patches/server/0621-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0620-Fix-invulnerable-end-crystals.patch rename to patches/server/0621-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0621-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0622-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0621-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0622-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0622-Fix-dangerous-end-portal-logic.patch b/patches/server/0623-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0622-Fix-dangerous-end-portal-logic.patch rename to patches/server/0623-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0623-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0623-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0624-Make-item-validations-configurable.patch b/patches/server/0625-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0624-Make-item-validations-configurable.patch rename to patches/server/0625-Make-item-validations-configurable.patch diff --git a/patches/server/0625-Line-Of-Sight-Changes.patch b/patches/server/0626-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0625-Line-Of-Sight-Changes.patch rename to patches/server/0626-Line-Of-Sight-Changes.patch diff --git a/patches/server/0626-add-per-world-spawn-limits.patch b/patches/server/0627-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0626-add-per-world-spawn-limits.patch rename to patches/server/0627-add-per-world-spawn-limits.patch diff --git a/patches/server/0627-Fix-potions-splash-events.patch b/patches/server/0628-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0627-Fix-potions-splash-events.patch rename to patches/server/0628-Fix-potions-splash-events.patch diff --git a/patches/server/0628-Add-more-LimitedRegion-API.patch b/patches/server/0629-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0628-Add-more-LimitedRegion-API.patch rename to patches/server/0629-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0629-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0629-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0630-Missing-Entity-Behavior-API.patch b/patches/server/0631-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0630-Missing-Entity-Behavior-API.patch rename to patches/server/0631-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0631-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0631-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0632-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0632-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0633-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0633-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0634-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0634-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0635-Adds-PlayerArmSwingEvent.patch b/patches/server/0636-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0635-Adds-PlayerArmSwingEvent.patch rename to patches/server/0636-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0636-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0636-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0637-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0637-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0638-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0639-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0638-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0639-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0639-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0640-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0639-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0640-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0640-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0640-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0641-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0641-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0642-Stinger-API.patch b/patches/server/0643-Stinger-API.patch similarity index 100% rename from patches/server/0642-Stinger-API.patch rename to patches/server/0643-Stinger-API.patch diff --git a/patches/server/0643-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0643-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0644-Add-System.out-err-catcher.patch b/patches/server/0645-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0644-Add-System.out-err-catcher.patch rename to patches/server/0645-Add-System.out-err-catcher.patch diff --git a/patches/server/0645-Fix-test-not-bootstrapping.patch b/patches/server/0646-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0645-Fix-test-not-bootstrapping.patch rename to patches/server/0646-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0647-Improve-boat-collision-performance.patch b/patches/server/0648-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0647-Improve-boat-collision-performance.patch rename to patches/server/0648-Improve-boat-collision-performance.patch diff --git a/patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0649-Add-PlayerSetSpawnEvent.patch b/patches/server/0650-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0649-Add-PlayerSetSpawnEvent.patch rename to patches/server/0650-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0650-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0650-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0651-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0652-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0651-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0652-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0652-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0653-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0652-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0653-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0653-Added-EntityDamageItemEvent.patch b/patches/server/0654-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0653-Added-EntityDamageItemEvent.patch rename to patches/server/0654-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0654-Optimize-indirect-passenger-iteration.patch b/patches/server/0655-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0654-Optimize-indirect-passenger-iteration.patch rename to patches/server/0655-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0655-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0655-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0656-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0657-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0656-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0657-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0657-Clear-bucket-NBT-after-dispense.patch b/patches/server/0658-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0657-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0658-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0658-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0658-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0659-Add-BlockBreakBlockEvent.patch b/patches/server/0660-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0659-Add-BlockBreakBlockEvent.patch rename to patches/server/0660-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0660-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0660-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0661-More-CommandBlock-API.patch b/patches/server/0662-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0661-More-CommandBlock-API.patch rename to patches/server/0662-More-CommandBlock-API.patch diff --git a/patches/server/0662-Add-missing-team-sidebar-display-slots.patch b/patches/server/0663-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0662-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0663-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0663-Add-back-EntityPortalExitEvent.patch b/patches/server/0664-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0663-Add-back-EntityPortalExitEvent.patch rename to patches/server/0664-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0664-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0664-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0665-Get-entity-default-attributes.patch b/patches/server/0666-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0665-Get-entity-default-attributes.patch rename to patches/server/0666-Get-entity-default-attributes.patch diff --git a/patches/server/0666-Left-handed-API.patch b/patches/server/0667-Left-handed-API.patch similarity index 100% rename from patches/server/0666-Left-handed-API.patch rename to patches/server/0667-Left-handed-API.patch diff --git a/patches/server/0667-Add-more-advancement-API.patch b/patches/server/0668-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0667-Add-more-advancement-API.patch rename to patches/server/0668-Add-more-advancement-API.patch diff --git a/patches/server/0668-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0668-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0669-Add-critical-damage-API.patch b/patches/server/0670-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0669-Add-critical-damage-API.patch rename to patches/server/0670-Add-critical-damage-API.patch diff --git a/patches/server/0670-Fix-issues-with-mob-conversion.patch b/patches/server/0671-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0670-Fix-issues-with-mob-conversion.patch rename to patches/server/0671-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0671-Add-isCollidable-methods-to-various-places.patch b/patches/server/0672-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0671-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0672-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0672-Goat-ram-API.patch b/patches/server/0673-Goat-ram-API.patch similarity index 100% rename from patches/server/0672-Goat-ram-API.patch rename to patches/server/0673-Goat-ram-API.patch diff --git a/patches/server/0673-Add-API-for-resetting-a-single-score.patch b/patches/server/0674-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0673-Add-API-for-resetting-a-single-score.patch rename to patches/server/0674-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0674-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0674-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0675-Vanilla-command-permission-fixes.patch b/patches/server/0676-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0675-Vanilla-command-permission-fixes.patch rename to patches/server/0676-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0676-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0676-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0677-Fix-GameProfileCache-concurrency.patch b/patches/server/0678-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0677-Fix-GameProfileCache-concurrency.patch rename to patches/server/0678-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0678-Improve-and-expand-AsyncCatcher.patch b/patches/server/0679-Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/0678-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0679-Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/0679-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0679-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0680-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0681-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0680-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0681-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/unapplied/server/0697-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0682-Allow-controlled-flushing-for-network-manager.patch similarity index 98% rename from patches/unapplied/server/0697-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0682-Allow-controlled-flushing-for-network-manager.patch index 77361f9f13..0cecd8e3e4 100644 --- a/patches/unapplied/server/0697-Allow-controlled-flushing-for-network-manager.patch +++ b/patches/server/0682-Allow-controlled-flushing-for-network-manager.patch @@ -9,7 +9,7 @@ This patch will be used to optimise out flush calls in later patches. diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index 1404389f16cb6ed8bb1b2dad35e364b1428810a4..d7dd0b806d8d8e3f04f165a2b29097a5c1bcd199 100644 +index 1a6326ce5160b18ecbef26d719b0a207ccad2783..1cd00de0e55f99f0266ae2e720dbc16f218b6e20 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -124,6 +124,39 @@ public class Connection extends SimpleChannelInboundHandler> { diff --git a/patches/server/0681-Optimise-general-POI-access.patch b/patches/server/0683-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0681-Optimise-general-POI-access.patch rename to patches/server/0683-Optimise-general-POI-access.patch diff --git a/patches/server/0682-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 100% rename from patches/server/0682-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch diff --git a/patches/server/0683-Optimise-chunk-tick-iteration.patch b/patches/server/0685-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0683-Optimise-chunk-tick-iteration.patch rename to patches/server/0685-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0684-Execute-chunk-tasks-mid-tick.patch b/patches/server/0686-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0684-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0686-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0685-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0685-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0686-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0686-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0687-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0689-Detail-more-information-in-watchdog-dumps.patch similarity index 98% rename from patches/server/0687-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0689-Detail-more-information-in-watchdog-dumps.patch index 55d94a8ea5..8197773cfb 100644 --- a/patches/server/0687-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/0689-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 358b41541284392f9a7a0ef3156e8adc8c005cc4..b7b8ac7f0e93c183e0e7f39cb753f28daace843f 100644 +index 1cd00de0e55f99f0266ae2e720dbc16f218b6e20..71cedd62689e721d71b47098ad52e63189748600 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java -@@ -349,7 +349,13 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -522,7 +522,13 @@ public class Connection extends SimpleChannelInboundHandler> { if (!(this.packetListener instanceof net.minecraft.server.network.ServerLoginPacketListenerImpl loginPacketListener) || loginPacketListener.state != net.minecraft.server.network.ServerLoginPacketListenerImpl.State.READY_TO_ACCEPT || Connection.joinAttemptsThisTick++ < MAX_PER_TICK) { diff --git a/patches/server/0688-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0690-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0688-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0690-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0689-Distance-manager-tick-timings.patch b/patches/server/0691-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0689-Distance-manager-tick-timings.patch rename to patches/server/0691-Distance-manager-tick-timings.patch diff --git a/patches/server/0690-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0692-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0690-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0692-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0691-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0693-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0691-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0693-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0692-Add-packet-limiter-config.patch b/patches/server/0694-Add-packet-limiter-config.patch similarity index 93% rename from patches/server/0692-Add-packet-limiter-config.patch rename to patches/server/0694-Add-packet-limiter-config.patch index 1ffe7d2456..52e12fb5a0 100644 --- a/patches/server/0692-Add-packet-limiter-config.patch +++ b/patches/server/0694-Add-packet-limiter-config.patch @@ -24,13 +24,13 @@ 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 b7b8ac7f0e93c183e0e7f39cb753f28daace843f..fde67116dde5dee59789de0e2ee70334db429559 100644 +index 71cedd62689e721d71b47098ad52e63189748600..1690626b8a62e078ce23e725c0384983af9c9e23 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java -@@ -120,6 +120,23 @@ public class Connection extends SimpleChannelInboundHandler> { - private static boolean enableExplicitFlush = Boolean.getBoolean("paper.explicit-flush"); - // Paper end - +@@ -156,6 +156,22 @@ public class Connection extends SimpleChannelInboundHandler> { + } + } + // Paper end - allow controlled flushing + // Paper start - packet limiter + protected final Object PACKET_LIMIT_LOCK = new Object(); + protected final @Nullable io.papermc.paper.util.IntervalledCounter allPacketCounts = io.papermc.paper.configuration.GlobalConfiguration.get().packetLimiter.allPackets.isEnabled() ? new io.papermc.paper.util.IntervalledCounter( @@ -47,11 +47,10 @@ index b7b8ac7f0e93c183e0e7f39cb753f28daace843f..fde67116dde5dee59789de0e2ee70334 + this.stopReadingPackets = true; + } + // Paper end - packet limiter -+ + public Connection(PacketFlow side) { this.receiving = side; - } -@@ -213,6 +230,45 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -240,6 +256,45 @@ public class Connection extends SimpleChannelInboundHandler> { protected void channelRead0(ChannelHandlerContext channelhandlercontext, Packet packet) { if (this.channel.isOpen()) { diff --git a/patches/server/0693-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0695-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0693-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0695-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0694-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0694-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0695-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0697-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0695-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0697-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0696-Time-scoreboard-search.patch b/patches/server/0698-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0696-Time-scoreboard-search.patch rename to patches/server/0698-Time-scoreboard-search.patch diff --git a/patches/server/0697-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0699-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0697-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0699-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0698-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0700-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0698-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0700-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0699-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0701-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0699-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0701-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0700-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0702-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0700-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0702-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0701-Optimise-random-block-ticking.patch b/patches/server/0703-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0701-Optimise-random-block-ticking.patch rename to patches/server/0703-Optimise-random-block-ticking.patch diff --git a/patches/server/0702-Optimise-nearby-player-lookups.patch b/patches/server/0704-Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/0702-Optimise-nearby-player-lookups.patch rename to patches/server/0704-Optimise-nearby-player-lookups.patch diff --git a/patches/server/0703-Remove-streams-for-villager-AI.patch b/patches/server/0705-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0703-Remove-streams-for-villager-AI.patch rename to patches/server/0705-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0704-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0706-Use-Velocity-compression-and-cipher-natives.patch similarity index 97% rename from patches/server/0704-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0706-Use-Velocity-compression-and-cipher-natives.patch index 7e8d4fdd66..dfb7728920 100644 --- a/patches/server/0704-Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/server/0706-Use-Velocity-compression-and-cipher-natives.patch @@ -268,10 +268,10 @@ index 792883afe53d2b7989c25a81c2f9a639d5e21d20..c04379ca8a4db0f4de46ad2b3b338431 return this.threshold; } diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index fde67116dde5dee59789de0e2ee70334db429559..f1d4d8001b44ded431ecfccafd7cefee6a552709 100644 +index 1690626b8a62e078ce23e725c0384983af9c9e23..4682fd171b323c7c1294c5ce8e5dd350e9cfd93b 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java -@@ -513,11 +513,28 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -698,11 +698,28 @@ public class Connection extends SimpleChannelInboundHandler> { return networkmanager; } @@ -304,7 +304,7 @@ index fde67116dde5dee59789de0e2ee70334db429559..f1d4d8001b44ded431ecfccafd7cefee public boolean isEncrypted() { return this.encrypted; -@@ -549,16 +566,17 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -734,16 +751,17 @@ public class Connection extends SimpleChannelInboundHandler> { public void setupCompression(int compressionThreshold, boolean rejectsBadPackets) { if (compressionThreshold >= 0) { @@ -325,10 +325,10 @@ index fde67116dde5dee59789de0e2ee70334db429559..f1d4d8001b44ded431ecfccafd7cefee 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 d86830ea180bebb409fc20ed43dd25cd0856f623..14f037e721ac8ba885536cab43d3d398b011a397 100644 +index 838244e3680ea6020701e10bafbde7f52976eaa1..e5e2f763d9b4b955df79ea0c4c79565be1fe59f0 100644 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -@@ -101,6 +101,11 @@ public class ServerConnectionListener { +@@ -103,6 +103,11 @@ public class ServerConnectionListener { ServerConnectionListener.LOGGER.info("Using default channel type"); } diff --git a/patches/server/0705-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0707-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0705-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0707-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0706-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0708-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0706-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0708-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0707-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0709-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0707-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0709-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0708-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0710-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0708-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0710-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0709-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0711-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0709-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0711-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0710-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0712-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0710-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0712-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0711-Ensure-valid-vehicle-status.patch b/patches/server/0713-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0711-Ensure-valid-vehicle-status.patch rename to patches/server/0713-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0712-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0714-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0712-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0714-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0713-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0715-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0713-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0715-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0714-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0716-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0714-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0716-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0715-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0717-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0715-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0717-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0716-Preserve-overstacked-loot.patch b/patches/server/0718-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0716-Preserve-overstacked-loot.patch rename to patches/server/0718-Preserve-overstacked-loot.patch diff --git a/patches/server/0717-Update-head-rotation-in-missing-places.patch b/patches/server/0719-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0717-Update-head-rotation-in-missing-places.patch rename to patches/server/0719-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0718-prevent-unintended-light-block-manipulation.patch b/patches/server/0720-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0718-prevent-unintended-light-block-manipulation.patch rename to patches/server/0720-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0719-Fix-CraftCriteria-defaults-map.patch b/patches/server/0721-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0719-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0721-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0720-Fix-upstreams-block-state-factories.patch b/patches/server/0722-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0720-Fix-upstreams-block-state-factories.patch rename to patches/server/0722-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0721-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0723-Add-config-option-for-logging-player-ip-addresses.patch similarity index 96% rename from patches/server/0721-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0723-Add-config-option-for-logging-player-ip-addresses.patch index 657cc5fe60..40fa785f5f 100644 --- a/patches/server/0721-Add-config-option-for-logging-player-ip-addresses.patch +++ b/patches/server/0723-Add-config-option-for-logging-player-ip-addresses.patch @@ -18,10 +18,10 @@ index 21393ad40095a4049e5b6871169b2db7aa92d13c..e6553b936dac1eb25a310d1a33acb0b1 InetSocketAddress virtualHost = com.destroystokyo.paper.network.PaperNetworkClient.prepareVirtualHost(host, port); com.destroystokyo.paper.event.server.PaperServerListPingEvent event = com.destroystokyo.paper.network.PaperLegacyStatusClient.processRequest( diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -index 14f037e721ac8ba885536cab43d3d398b011a397..17f42a4097d9c91bae2ccb02365498a0f7c7f8f8 100644 +index e5e2f763d9b4b955df79ea0c4c79565be1fe59f0..2beddfc0532c3835d50724551e3d46cb0d7d2290 100644 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -@@ -204,7 +204,7 @@ public class ServerConnectionListener { +@@ -207,7 +207,7 @@ public class ServerConnectionListener { throw new ReportedException(CrashReport.forThrowable(exception, "Ticking memory connection")); } diff --git a/patches/server/0722-Configurable-feature-seeds.patch b/patches/server/0724-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0722-Configurable-feature-seeds.patch rename to patches/server/0724-Configurable-feature-seeds.patch diff --git a/patches/server/0723-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0725-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0723-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0725-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0724-Add-root-admin-user-detection.patch b/patches/server/0726-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0724-Add-root-admin-user-detection.patch rename to patches/server/0726-Add-root-admin-user-detection.patch diff --git a/patches/server/0725-Always-allow-item-changing-in-Fireball.patch b/patches/server/0727-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0725-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0727-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0726-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0728-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0726-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0728-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0727-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0729-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0727-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0729-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0728-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0730-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0728-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0730-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0729-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0731-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0729-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0731-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0730-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0732-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0730-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0732-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0731-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0733-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0731-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0733-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0732-Fix-Spigot-growth-modifiers.patch b/patches/server/0734-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0732-Fix-Spigot-growth-modifiers.patch rename to patches/server/0734-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0733-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0735-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0733-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0735-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0734-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0736-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0734-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0736-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0735-Add-player-health-update-API.patch b/patches/server/0737-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0735-Add-player-health-update-API.patch rename to patches/server/0737-Add-player-health-update-API.patch diff --git a/patches/server/0736-Optimize-HashMapPalette.patch b/patches/server/0738-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0736-Optimize-HashMapPalette.patch rename to patches/server/0738-Optimize-HashMapPalette.patch diff --git a/patches/server/0737-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0739-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0737-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0739-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0738-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0740-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 100% rename from patches/server/0738-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0740-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch diff --git a/patches/server/0739-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0741-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0739-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0741-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0740-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0742-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0740-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0742-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0741-Add-more-Campfire-API.patch b/patches/server/0743-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0741-Add-more-Campfire-API.patch rename to patches/server/0743-Add-more-Campfire-API.patch diff --git a/patches/server/0742-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0744-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0742-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0744-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0743-Fix-tripwire-state-inconsistency.patch b/patches/server/0745-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0743-Fix-tripwire-state-inconsistency.patch rename to patches/server/0745-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0744-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0746-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0744-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0746-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0745-Improve-scoreboard-entries.patch b/patches/server/0747-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0745-Improve-scoreboard-entries.patch rename to patches/server/0747-Improve-scoreboard-entries.patch diff --git a/patches/server/0746-Entity-powdered-snow-API.patch b/patches/server/0748-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0746-Entity-powdered-snow-API.patch rename to patches/server/0748-Entity-powdered-snow-API.patch diff --git a/patches/server/0747-Add-API-for-item-entity-health.patch b/patches/server/0749-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0747-Add-API-for-item-entity-health.patch rename to patches/server/0749-Add-API-for-item-entity-health.patch diff --git a/patches/server/0748-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0750-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0748-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0750-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0749-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0751-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0749-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0751-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0750-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0752-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0750-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0752-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0751-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0753-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0751-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0753-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0752-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0754-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0752-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0754-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0753-Fix-bees-aging-inside-hives.patch b/patches/server/0755-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0753-Fix-bees-aging-inside-hives.patch rename to patches/server/0755-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0754-Bucketable-API.patch b/patches/server/0756-Bucketable-API.patch similarity index 100% rename from patches/server/0754-Bucketable-API.patch rename to patches/server/0756-Bucketable-API.patch diff --git a/patches/server/0755-Validate-usernames.patch b/patches/server/0757-Validate-usernames.patch similarity index 100% rename from patches/server/0755-Validate-usernames.patch rename to patches/server/0757-Validate-usernames.patch diff --git a/patches/server/0756-Make-water-animal-spawn-height-configurable.patch b/patches/server/0758-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0756-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0758-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0759-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0759-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0758-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0760-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0758-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0760-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0759-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0761-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0759-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0761-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0760-Multiple-Entries-with-Scoreboards.patch b/patches/server/0762-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0760-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0762-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0761-Reset-placed-block-on-exception.patch b/patches/server/0763-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0761-Reset-placed-block-on-exception.patch rename to patches/server/0763-Reset-placed-block-on-exception.patch diff --git a/patches/server/0762-Add-configurable-height-for-slime-spawn.patch b/patches/server/0764-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0762-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0764-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0763-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0765-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0763-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0765-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0764-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0766-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0764-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0766-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0765-Kick-on-main-for-illegal-chat.patch b/patches/server/0767-Kick-on-main-for-illegal-chat.patch similarity index 100% rename from patches/server/0765-Kick-on-main-for-illegal-chat.patch rename to patches/server/0767-Kick-on-main-for-illegal-chat.patch diff --git a/patches/server/0766-Multi-Block-Change-API-Implementation.patch b/patches/server/0768-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0766-Multi-Block-Change-API-Implementation.patch rename to patches/server/0768-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0767-Fix-NotePlayEvent.patch b/patches/server/0769-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0767-Fix-NotePlayEvent.patch rename to patches/server/0769-Fix-NotePlayEvent.patch diff --git a/patches/server/0768-Freeze-Tick-Lock-API.patch b/patches/server/0770-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0768-Freeze-Tick-Lock-API.patch rename to patches/server/0770-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0769-Dolphin-API.patch b/patches/server/0771-Dolphin-API.patch similarity index 100% rename from patches/server/0769-Dolphin-API.patch rename to patches/server/0771-Dolphin-API.patch diff --git a/patches/server/0770-More-PotionEffectType-API.patch b/patches/server/0772-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0770-More-PotionEffectType-API.patch rename to patches/server/0772-More-PotionEffectType-API.patch diff --git a/patches/server/0771-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0773-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0771-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0773-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0772-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0774-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0772-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0774-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0773-Add-missing-structure-set-seed-configs.patch b/patches/server/0775-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0773-Add-missing-structure-set-seed-configs.patch rename to patches/server/0775-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0774-Implement-regenerateChunk.patch b/patches/server/0776-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0774-Implement-regenerateChunk.patch rename to patches/server/0776-Implement-regenerateChunk.patch diff --git a/patches/server/0775-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0777-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0775-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0777-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0776-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0778-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0776-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0778-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0777-Add-GameEvent-tags.patch b/patches/server/0779-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0777-Add-GameEvent-tags.patch rename to patches/server/0779-Add-GameEvent-tags.patch diff --git a/patches/server/0778-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0780-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0778-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0780-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0779-Furnace-RecipesUsed-API.patch b/patches/server/0781-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0779-Furnace-RecipesUsed-API.patch rename to patches/server/0781-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0780-Configurable-sculk-sensor-listener-range.patch b/patches/server/0782-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0780-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0782-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0781-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0783-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0781-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0783-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0782-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0784-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0782-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0784-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0783-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0785-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0783-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0785-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0784-Fix-Entity-Position-Desync.patch b/patches/server/0786-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0784-Fix-Entity-Position-Desync.patch rename to patches/server/0786-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0785-Custom-Potion-Mixes.patch b/patches/server/0787-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0785-Custom-Potion-Mixes.patch rename to patches/server/0787-Custom-Potion-Mixes.patch diff --git a/patches/server/0786-Force-close-world-loading-screen.patch b/patches/server/0788-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0786-Force-close-world-loading-screen.patch rename to patches/server/0788-Force-close-world-loading-screen.patch diff --git a/patches/server/0787-Fix-falling-block-spawn-methods.patch b/patches/server/0789-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0787-Fix-falling-block-spawn-methods.patch rename to patches/server/0789-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0788-Expose-furnace-minecart-push-values.patch b/patches/server/0790-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0788-Expose-furnace-minecart-push-values.patch rename to patches/server/0790-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0789-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0791-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0789-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0791-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0790-More-Projectile-API.patch b/patches/server/0792-More-Projectile-API.patch similarity index 100% rename from patches/server/0790-More-Projectile-API.patch rename to patches/server/0792-More-Projectile-API.patch diff --git a/patches/server/0791-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0793-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0791-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0793-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0792-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0794-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0792-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0794-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0793-Implement-getComputedBiome-API.patch b/patches/server/0795-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0793-Implement-getComputedBiome-API.patch rename to patches/server/0795-Implement-getComputedBiome-API.patch diff --git a/patches/server/0794-Make-some-itemstacks-nonnull.patch b/patches/server/0796-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0794-Make-some-itemstacks-nonnull.patch rename to patches/server/0796-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0795-Implement-enchantWithLevels-API.patch b/patches/server/0797-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0795-Implement-enchantWithLevels-API.patch rename to patches/server/0797-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0796-Fix-saving-in-unloadWorld.patch b/patches/server/0798-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0796-Fix-saving-in-unloadWorld.patch rename to patches/server/0798-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0797-Buffer-OOB-setBlock-calls.patch b/patches/server/0799-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0797-Buffer-OOB-setBlock-calls.patch rename to patches/server/0799-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0798-Add-TameableDeathMessageEvent.patch b/patches/server/0800-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0798-Add-TameableDeathMessageEvent.patch rename to patches/server/0800-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0799-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0801-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0799-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0801-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0800-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0802-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0800-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0802-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0801-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0803-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0801-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0803-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0802-Guard-against-invalid-entity-positions.patch b/patches/server/0804-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0802-Guard-against-invalid-entity-positions.patch rename to patches/server/0804-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0803-cache-resource-keys.patch b/patches/server/0805-cache-resource-keys.patch similarity index 100% rename from patches/server/0803-cache-resource-keys.patch rename to patches/server/0805-cache-resource-keys.patch diff --git a/patches/server/0804-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0806-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0804-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0806-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0805-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0807-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0805-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0807-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0806-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0808-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0806-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0808-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0807-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0809-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0807-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0809-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0808-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0810-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0808-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0810-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0809-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0811-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0809-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/server/0811-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0812-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 100% rename from patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0812-Pass-ServerLevel-for-gamerule-callbacks.patch diff --git a/patches/server/0811-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0813-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0811-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0813-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0812-WorldCreator-keepSpawnLoaded.patch b/patches/server/0814-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0812-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0814-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0813-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0813-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0814-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0814-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0815-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0815-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0816-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0816-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0817-Add-PlayerStopUsingItemEvent.patch b/patches/server/0819-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0817-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0819-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0818-FallingBlock-auto-expire-setting.patch b/patches/server/0820-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0818-FallingBlock-auto-expire-setting.patch rename to patches/server/0820-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0819-Don-t-tick-markers.patch b/patches/server/0821-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0819-Don-t-tick-markers.patch rename to patches/server/0821-Don-t-tick-markers.patch diff --git a/patches/server/0820-Do-not-accept-invalid-client-settings.patch b/patches/server/0822-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0820-Do-not-accept-invalid-client-settings.patch rename to patches/server/0822-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0821-Add-support-for-Proxy-Protocol.patch b/patches/server/0823-Add-support-for-Proxy-Protocol.patch similarity index 94% rename from patches/server/0821-Add-support-for-Proxy-Protocol.patch rename to patches/server/0823-Add-support-for-Proxy-Protocol.patch index b6b30e9680..d02eeb6d9b 100644 --- a/patches/server/0821-Add-support-for-Proxy-Protocol.patch +++ b/patches/server/0823-Add-support-for-Proxy-Protocol.patch @@ -17,10 +17,10 @@ index 9b37c31b97a95faeb4b31ed2ead82c07cf3ce6d0..a3a76b9b7efa773117d2ee1ce53ef784 implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion implementation("org.ow2.asm:asm:9.4") diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -index 17f42a4097d9c91bae2ccb02365498a0f7c7f8f8..0f578e870f2bed207a8650a31e89b3672ae8a57b 100644 +index 2beddfc0532c3835d50724551e3d46cb0d7d2290..44d99e89226adb6234b9405f25ac9dab9bd84297 100644 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -@@ -106,6 +106,12 @@ public class ServerConnectionListener { +@@ -108,6 +108,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 17f42a4097d9c91bae2ccb02365498a0f7c7f8f8..0f578e870f2bed207a8650a31e89b367 this.channels.add(((ServerBootstrap) ((ServerBootstrap) (new ServerBootstrap()).channel(oclass)).childHandler(new ChannelInitializer() { protected void initChannel(Channel channel) { try { -@@ -120,6 +126,30 @@ public class ServerConnectionListener { +@@ -123,6 +129,30 @@ public class ServerConnectionListener { int j = ServerConnectionListener.this.server.getRateLimitPacketsPerSecond(); Connection object = j > 0 ? new RateKickingConnection(j) : new Connection(PacketFlow.SERVERBOUND); // CraftBukkit - decompile error diff --git a/patches/server/0822-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0822-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0823-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0823-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0824-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0824-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0825-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0825-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0826-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0826-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0827-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0827-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0828-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0830-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0828-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0830-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0829-Dont-resent-entity-on-art-update.patch b/patches/server/0831-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0829-Dont-resent-entity-on-art-update.patch rename to patches/server/0831-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0830-Add-WardenAngerChangeEvent.patch b/patches/server/0832-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0830-Add-WardenAngerChangeEvent.patch rename to patches/server/0832-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0831-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0831-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0832-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0832-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0833-Nameable-Banner-API.patch b/patches/server/0835-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0833-Nameable-Banner-API.patch rename to patches/server/0835-Nameable-Banner-API.patch diff --git a/patches/server/0834-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0834-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0835-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0835-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0836-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0836-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0837-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 100% rename from patches/server/0837-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch diff --git a/patches/server/0838-Add-Player-getFishHook.patch b/patches/server/0840-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0838-Add-Player-getFishHook.patch rename to patches/server/0840-Add-Player-getFishHook.patch diff --git a/patches/server/0839-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0839-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0840-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0840-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0841-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 100% rename from patches/server/0841-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch diff --git a/patches/server/0842-Fix-Bee-flower-NPE.patch b/patches/server/0844-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0842-Fix-Bee-flower-NPE.patch rename to patches/server/0844-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0843-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0843-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0844-More-Teleport-API.patch b/patches/server/0846-More-Teleport-API.patch similarity index 100% rename from patches/server/0844-More-Teleport-API.patch rename to patches/server/0846-More-Teleport-API.patch diff --git a/patches/server/0845-Add-EntityPortalReadyEvent.patch b/patches/server/0847-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0845-Add-EntityPortalReadyEvent.patch rename to patches/server/0847-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0846-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0846-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0847-Send-block-entities-after-destroy-prediction.patch b/patches/server/0849-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0847-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0849-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0848-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0848-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0849-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0849-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0850-Add-missing-BlockFadeEvents.patch b/patches/server/0852-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0850-Add-missing-BlockFadeEvents.patch rename to patches/server/0852-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0851-Collision-API.patch b/patches/server/0853-Collision-API.patch similarity index 100% rename from patches/server/0851-Collision-API.patch rename to patches/server/0853-Collision-API.patch diff --git a/patches/server/0852-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0852-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0853-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0855-Remove-invalid-signature-login-stacktrace.patch similarity index 100% rename from patches/server/0853-Remove-invalid-signature-login-stacktrace.patch rename to patches/server/0855-Remove-invalid-signature-login-stacktrace.patch diff --git a/patches/server/0854-Block-Ticking-API.patch b/patches/server/0856-Block-Ticking-API.patch similarity index 100% rename from patches/server/0854-Block-Ticking-API.patch rename to patches/server/0856-Block-Ticking-API.patch diff --git a/patches/server/0855-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0857-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0855-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0857-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0856-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0858-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0856-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0858-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0857-Add-NamespacedKey-biome-methods.patch b/patches/server/0859-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0857-Add-NamespacedKey-biome-methods.patch rename to patches/server/0859-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0858-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0860-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0858-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0860-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0859-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0861-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0859-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0861-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0860-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0862-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0860-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0862-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0861-Missing-eating-regain-reason.patch b/patches/server/0863-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0861-Missing-eating-regain-reason.patch rename to patches/server/0863-Missing-eating-regain-reason.patch diff --git a/patches/server/0862-Missing-effect-cause.patch b/patches/server/0864-Missing-effect-cause.patch similarity index 100% rename from patches/server/0862-Missing-effect-cause.patch rename to patches/server/0864-Missing-effect-cause.patch diff --git a/patches/server/0863-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0865-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0863-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0865-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0864-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0866-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0864-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0866-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0865-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0867-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0865-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0867-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0866-Configurable-chat-thread-limit.patch b/patches/server/0868-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0866-Configurable-chat-thread-limit.patch rename to patches/server/0868-Configurable-chat-thread-limit.patch diff --git a/patches/server/0867-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0869-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0867-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0869-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0868-fix-Jigsaw-block-kicking-user.patch b/patches/server/0870-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0868-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0870-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0869-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0871-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0869-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0871-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0870-Add-getDrops-to-BlockState.patch b/patches/server/0872-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0870-Add-getDrops-to-BlockState.patch rename to patches/server/0872-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0871-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0873-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0871-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0873-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0872-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0874-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0872-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0874-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0873-Fix-custom-piglin-loved-items.patch b/patches/server/0875-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0873-Fix-custom-piglin-loved-items.patch rename to patches/server/0875-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0874-EntityPickupItemEvent-fixes.patch b/patches/server/0876-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0874-EntityPickupItemEvent-fixes.patch rename to patches/server/0876-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0875-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0877-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0875-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0877-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0876-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0878-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0876-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0878-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0877-Elder-Guardian-appearance-API.patch b/patches/server/0879-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0877-Elder-Guardian-appearance-API.patch rename to patches/server/0879-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0878-Allow-changing-bed-s-occupied-property.patch b/patches/server/0880-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0878-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0880-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0879-Add-entity-knockback-API.patch b/patches/server/0881-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0879-Add-entity-knockback-API.patch rename to patches/server/0881-Add-entity-knockback-API.patch diff --git a/patches/server/0880-Detect-headless-JREs.patch b/patches/server/0882-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0880-Detect-headless-JREs.patch rename to patches/server/0882-Detect-headless-JREs.patch diff --git a/patches/server/0881-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0883-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0881-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0883-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0882-optimized-dirt-and-snow-spreading.patch b/patches/server/0884-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0882-optimized-dirt-and-snow-spreading.patch rename to patches/server/0884-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0883-Added-EntityToggleSitEvent.patch b/patches/server/0885-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0883-Added-EntityToggleSitEvent.patch rename to patches/server/0885-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0884-Add-fire-tick-delay-option.patch b/patches/server/0886-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0884-Add-fire-tick-delay-option.patch rename to patches/server/0886-Add-fire-tick-delay-option.patch diff --git a/patches/server/0885-Add-Moving-Piston-API.patch b/patches/server/0887-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0885-Add-Moving-Piston-API.patch rename to patches/server/0887-Add-Moving-Piston-API.patch diff --git a/patches/server/0886-Ignore-impossible-spawn-tick.patch b/patches/server/0888-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0886-Ignore-impossible-spawn-tick.patch rename to patches/server/0888-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0887-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0889-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0887-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0889-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0888-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0890-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0888-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0890-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0889-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0891-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0889-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0891-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0890-Prevent-compass-from-loading-chunks.patch b/patches/server/0892-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0890-Prevent-compass-from-loading-chunks.patch rename to patches/server/0892-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0891-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0893-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0891-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0893-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0892-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0894-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0892-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0894-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0893-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0895-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0893-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0895-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0894-Add-Player-Warden-Warning-API.patch b/patches/server/0896-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0894-Add-Player-Warden-Warning-API.patch rename to patches/server/0896-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0895-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0897-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0895-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0897-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0896-Add-paper-dumplisteners-command.patch b/patches/server/0898-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0896-Add-paper-dumplisteners-command.patch rename to patches/server/0898-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0897-check-global-player-list-where-appropriate.patch b/patches/server/0899-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0897-check-global-player-list-where-appropriate.patch rename to patches/server/0899-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0898-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0900-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0898-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0900-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0899-ItemStack-damage-API.patch b/patches/server/0901-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0899-ItemStack-damage-API.patch rename to patches/server/0901-ItemStack-damage-API.patch diff --git a/patches/server/0900-Friction-API.patch b/patches/server/0902-Friction-API.patch similarity index 100% rename from patches/server/0900-Friction-API.patch rename to patches/server/0902-Friction-API.patch diff --git a/patches/server/0901-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0903-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0901-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0903-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0902-Fix-player-kick-on-shutdown.patch b/patches/server/0904-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0902-Fix-player-kick-on-shutdown.patch rename to patches/server/0904-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0903-Sync-offhand-slot-in-menus.patch b/patches/server/0905-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0903-Sync-offhand-slot-in-menus.patch rename to patches/server/0905-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0904-Player-Entity-Tracking-Events.patch b/patches/server/0906-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0904-Player-Entity-Tracking-Events.patch rename to patches/server/0906-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0905-Limit-pet-look-distance.patch b/patches/server/0907-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0905-Limit-pet-look-distance.patch rename to patches/server/0907-Limit-pet-look-distance.patch diff --git a/patches/server/0906-Properly-resend-entities.patch b/patches/server/0908-Properly-resend-entities.patch similarity index 100% rename from patches/server/0906-Properly-resend-entities.patch rename to patches/server/0908-Properly-resend-entities.patch diff --git a/patches/server/0907-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0909-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0907-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0909-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0908-fix-Instruments.patch b/patches/server/0910-fix-Instruments.patch similarity index 100% rename from patches/server/0908-fix-Instruments.patch rename to patches/server/0910-fix-Instruments.patch diff --git a/patches/server/0909-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0911-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0909-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0911-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0910-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0912-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0910-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0912-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0911-Improve-logging-and-errors.patch b/patches/server/0913-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0911-Improve-logging-and-errors.patch rename to patches/server/0913-Improve-logging-and-errors.patch diff --git a/patches/server/0912-Add-BlockLockCheckEvent.patch b/patches/server/0914-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0912-Add-BlockLockCheckEvent.patch rename to patches/server/0914-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0913-Add-Sneaking-API-for-Entities.patch b/patches/server/0915-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0913-Add-Sneaking-API-for-Entities.patch rename to patches/server/0915-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0914-Improve-PortalEvents.patch b/patches/server/0916-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0914-Improve-PortalEvents.patch rename to patches/server/0916-Improve-PortalEvents.patch diff --git a/patches/server/0915-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0917-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0915-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0917-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0918-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0918-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0917-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0919-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0917-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0919-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0918-Flying-Fall-Damage.patch b/patches/server/0920-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0918-Flying-Fall-Damage.patch rename to patches/server/0920-Flying-Fall-Damage.patch diff --git a/patches/server/0919-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0921-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/server/0919-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/server/0921-Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/server/0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0922-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0922-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0921-config-for-disabling-entity-tag-tags.patch b/patches/server/0923-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0921-config-for-disabling-entity-tag-tags.patch rename to patches/server/0923-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0922-Use-single-player-info-update-packet-on-join.patch b/patches/server/0924-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0922-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0924-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0923-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0925-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0923-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0925-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0924-Win-Screen-API.patch b/patches/server/0926-Win-Screen-API.patch similarity index 100% rename from patches/server/0924-Win-Screen-API.patch rename to patches/server/0926-Win-Screen-API.patch diff --git a/patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0927-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0927-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0926-Fix-force-opening-enchantment-tables.patch b/patches/server/0928-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0926-Fix-force-opening-enchantment-tables.patch rename to patches/server/0928-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0927-Add-Entity-Body-Yaw-API.patch b/patches/server/0929-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0927-Add-Entity-Body-Yaw-API.patch rename to patches/server/0929-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0928-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0930-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0928-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0930-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0929-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0931-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0929-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0931-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0930-Add-EntityFertilizeEggEvent.patch b/patches/server/0932-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0930-Add-EntityFertilizeEggEvent.patch rename to patches/server/0932-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0931-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0933-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0931-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0933-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0932-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0934-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0932-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0934-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0933-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0935-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0933-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0935-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0934-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0936-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0934-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0936-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0935-Fix-text-display-error-on-spawn.patch b/patches/server/0937-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0935-Fix-text-display-error-on-spawn.patch rename to patches/server/0937-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0936-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0938-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0936-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0938-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0937-Add-Shearable-API.patch b/patches/server/0939-Add-Shearable-API.patch similarity index 100% rename from patches/server/0937-Add-Shearable-API.patch rename to patches/server/0939-Add-Shearable-API.patch diff --git a/patches/server/0938-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0940-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0938-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0940-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0939-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0941-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 100% rename from patches/server/0939-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/server/0941-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch diff --git a/patches/server/0940-Optimize-Hoppers.patch b/patches/server/0942-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0940-Optimize-Hoppers.patch rename to patches/server/0942-Optimize-Hoppers.patch diff --git a/patches/server/0941-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0943-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0941-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0943-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0942-Fix-api-checking-banned-ips.patch b/patches/server/0944-Fix-api-checking-banned-ips.patch similarity index 100% rename from patches/server/0942-Fix-api-checking-banned-ips.patch rename to patches/server/0944-Fix-api-checking-banned-ips.patch diff --git a/patches/server/0943-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0945-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0943-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0945-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0944-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0946-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0944-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0946-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0945-remove-duplicate-animate-packet-for-records.patch b/patches/server/0947-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0945-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0947-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0946-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0948-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0946-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0948-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0949-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0949-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0948-Use-array-for-gamerule-storage.patch b/patches/server/0950-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0948-Use-array-for-gamerule-storage.patch rename to patches/server/0950-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0951-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0951-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0952-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0952-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0951-Add-Mob-Experience-reward-API.patch b/patches/server/0953-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0951-Add-Mob-Experience-reward-API.patch rename to patches/server/0953-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0954-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0954-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0955-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0955-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0956-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0956-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0955-More-accurate-isInOpenWater-impl.patch b/patches/server/0957-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0955-More-accurate-isInOpenWater-impl.patch rename to patches/server/0957-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0958-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0958-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0959-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0959-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0960-Fix-destroying-beehive-without-any-players-nearby-th.patch similarity index 100% rename from patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch rename to patches/server/0960-Fix-destroying-beehive-without-any-players-nearby-th.patch diff --git a/patches/server/0959-Expand-PlayerItemMendEvent.patch b/patches/server/0961-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0959-Expand-PlayerItemMendEvent.patch rename to patches/server/0961-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0962-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0962-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0961-Add-transient-modifier-API.patch b/patches/server/0963-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0961-Add-transient-modifier-API.patch rename to patches/server/0963-Add-transient-modifier-API.patch