diff --git a/patches/server/0054-Ensure-inv-drag-is-in-bounds.patch b/patches/server/0054-Ensure-inv-drag-is-in-bounds.patch deleted file mode 100644 index 407fdbf4db..0000000000 --- a/patches/server/0054-Ensure-inv-drag-is-in-bounds.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Joseph Hirschfeld -Date: Thu, 3 Mar 2016 02:33:53 -0600 -Subject: [PATCH] Ensure inv drag is in bounds - - -diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java -index f15415ff5fb099a048fe0f898e15bc4303a47ef5..f7976bd9561601a6ce1d5b4874b08bba9754d753 100644 ---- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java -+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java -@@ -417,7 +417,7 @@ public abstract class AbstractContainerMenu { - this.resetQuickCraft(); - } - } else if (this.quickcraftStatus == 1) { -- slot = (Slot) this.slots.get(slotIndex); -+ slot = slotIndex < this.slots.size() ? this.slots.get(slotIndex) : null; // Paper - Ensure drag in bounds - itemstack = this.getCarried(); - if (AbstractContainerMenu.canItemQuickReplace(slot, itemstack, true) && slot.mayPlace(itemstack) && (this.quickcraftType == 2 || itemstack.getCount() > this.quickcraftSlots.size()) && this.canDragTo(slot)) { - this.quickcraftSlots.add(slot); diff --git a/patches/server/0055-Player-Tab-List-and-Title-APIs.patch b/patches/server/0054-Player-Tab-List-and-Title-APIs.patch similarity index 98% rename from patches/server/0055-Player-Tab-List-and-Title-APIs.patch rename to patches/server/0054-Player-Tab-List-and-Title-APIs.patch index 30401cd7f8..da0ca18eab 100644 --- a/patches/server/0055-Player-Tab-List-and-Title-APIs.patch +++ b/patches/server/0054-Player-Tab-List-and-Title-APIs.patch @@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4 // Paper end buf.writeComponent(this.text); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e13af07709acdbe5060e2959f6762fcffa65fd05..d7177eb9c3cf65cacc90752215d591058b8106b8 100644 +index b3fc0f67715707bf4ad6ff88fbf8dab1c830d74b..8db291b3dceaa49f095cf7486e4b7f69209548b4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0056-Add-configurable-portal-search-radius.patch b/patches/server/0055-Add-configurable-portal-search-radius.patch similarity index 100% rename from patches/server/0056-Add-configurable-portal-search-radius.patch rename to patches/server/0055-Add-configurable-portal-search-radius.patch diff --git a/patches/server/0057-Add-velocity-warnings.patch b/patches/server/0056-Add-velocity-warnings.patch similarity index 98% rename from patches/server/0057-Add-velocity-warnings.patch rename to patches/server/0056-Add-velocity-warnings.patch index 2785feca89..7315eb6708 100644 --- a/patches/server/0057-Add-velocity-warnings.patch +++ b/patches/server/0056-Add-velocity-warnings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d73c97e0d762e49b2ef757671cb52c68511f9ff6..37c1e4b31c06b9bf48325a7d5f293020b00445b1 100644 +index af723e317878e024abac59be8c1cc0a228a45980..d55bc1b83bd3ae99533b41c941d762f130f51c94 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -293,6 +293,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0058-Configurable-inter-world-teleportation-safety.patch b/patches/server/0057-Configurable-inter-world-teleportation-safety.patch similarity index 94% rename from patches/server/0058-Configurable-inter-world-teleportation-safety.patch rename to patches/server/0057-Configurable-inter-world-teleportation-safety.patch index f81dbd9a5f..62705fa37c 100644 --- a/patches/server/0058-Configurable-inter-world-teleportation-safety.patch +++ b/patches/server/0057-Configurable-inter-world-teleportation-safety.patch @@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended This only is the case if the player is teleporting between worlds. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b03d7b6f05801efa7257df5da0d8666d2bf66050..0145f97947028b87f00ba652b9af6bdcbd3afe9c 100644 +index 8db291b3dceaa49f095cf7486e4b7f69209548b4..f552e14a3164c8b877c5017911eada24ed067e9c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1145,7 +1145,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0059-Add-exception-reporting-event.patch b/patches/server/0058-Add-exception-reporting-event.patch similarity index 99% rename from patches/server/0059-Add-exception-reporting-event.patch rename to patches/server/0058-Add-exception-reporting-event.patch index 935dd3e71d..b4edd3ff2c 100644 --- a/patches/server/0059-Add-exception-reporting-event.patch +++ b/patches/server/0058-Add-exception-reporting-event.patch @@ -131,7 +131,7 @@ index 0e4f6893a2fce69782c4246c52e03926fe2df26f..5c58031279c0b74d2061c802e60b7bed } diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index d11a715dccaaf2a2faeef8af9ff6e5f1914416cb..b78e89eed44a06bb8c7a8a62e561574d4dc4b2de 100644 +index f21ae1ae8af79c1c0c6f2feaa933638add0aa065..ba24e32f96797ed8c8bd82391d1903f6ad2a9813 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -1,6 +1,7 @@ diff --git a/patches/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/server/0059-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch similarity index 100% rename from patches/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch rename to patches/server/0059-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch diff --git a/patches/server/0061-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0060-Disable-Scoreboards-for-non-players-by-default.patch similarity index 100% rename from patches/server/0061-Disable-Scoreboards-for-non-players-by-default.patch rename to patches/server/0060-Disable-Scoreboards-for-non-players-by-default.patch diff --git a/patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0061-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/server/0061-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/server/0063-Chunk-Save-Reattempt.patch b/patches/server/0062-Chunk-Save-Reattempt.patch similarity index 100% rename from patches/server/0063-Chunk-Save-Reattempt.patch rename to patches/server/0062-Chunk-Save-Reattempt.patch diff --git a/patches/server/0064-Complete-resource-pack-API.patch b/patches/server/0063-Complete-resource-pack-API.patch similarity index 100% rename from patches/server/0064-Complete-resource-pack-API.patch rename to patches/server/0063-Complete-resource-pack-API.patch diff --git a/patches/server/0065-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0064-Default-loading-permissions.yml-before-plugins.patch similarity index 95% rename from patches/server/0065-Default-loading-permissions.yml-before-plugins.patch rename to patches/server/0064-Default-loading-permissions.yml-before-plugins.patch index b9e9f452fd..bf475d5464 100644 --- a/patches/server/0065-Default-loading-permissions.yml-before-plugins.patch +++ b/patches/server/0064-Default-loading-permissions.yml-before-plugins.patch @@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe A config option has been added for those who depend on the previous behavior, but I don't expect that. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 37c1e4b31c06b9bf48325a7d5f293020b00445b1..f2e27681e095439ff0df027ec16796a464e34239 100644 +index d55bc1b83bd3ae99533b41c941d762f130f51c94..bf752e456f44a8be2344678b657b8d0869b75c23 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -475,6 +475,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0065-Allow-Reloading-of-Custom-Permissions.patch similarity index 100% rename from patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch rename to patches/server/0065-Allow-Reloading-of-Custom-Permissions.patch diff --git a/patches/server/0067-Remove-Metadata-on-reload.patch b/patches/server/0066-Remove-Metadata-on-reload.patch similarity index 93% rename from patches/server/0067-Remove-Metadata-on-reload.patch rename to patches/server/0066-Remove-Metadata-on-reload.patch index f400f87a2a..523367c700 100644 --- a/patches/server/0067-Remove-Metadata-on-reload.patch +++ b/patches/server/0066-Remove-Metadata-on-reload.patch @@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c056df734deb0f9ad2e102075e941a7fdcd78195..0b8f2a747b0e869dfd62ef463261941988d8dd16 100644 +index 93e98d43f71d376b28e566244bd650d22645e194..c46ebebb2b47e07962d8b4a69777161e6428dd6b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -963,8 +963,16 @@ public final class CraftServer implements Server { diff --git a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0067-Handle-Item-Meta-Inconsistencies.patch similarity index 99% rename from patches/server/0068-Handle-Item-Meta-Inconsistencies.patch rename to patches/server/0067-Handle-Item-Meta-Inconsistencies.patch index b71515e3ff..f559f9ab4a 100644 --- a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch +++ b/patches/server/0067-Handle-Item-Meta-Inconsistencies.patch @@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the ItemMeta API equivalents, and should deprecate the old API's. diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 489cb50f70589c87dd8fb57087e5fa14fd5e1c43..d979c94861f0d38d55fc1ac0214b1313fe5f08f5 100644 +index cf810a1d645dd63595702a5f07456cd48393ee79..87031aa69148118d9f5bf16cb8a55cf72f9d0a1d 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -155,6 +155,23 @@ public final class ItemStack { diff --git a/patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 93% rename from patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to patches/server/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch index d7f13032d9..6a09b0d45d 100644 --- a/patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/patches/server/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate Can set a much shorter despawn rate for arrows that players can not pick up. diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index eff6a93af46476f173f13fc35ca6c8cec7de37c9..cfd202d32048abcd3e961d9f7f08c1bc6282e601 100644 +index 3e1f5fcf589ad7916adb44b53490ccac947a8799..d4b8364fd860ee2cc632d8c752435b9b311c7ece 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -312,7 +312,7 @@ public abstract class AbstractArrow extends Projectile { diff --git a/patches/server/0070-Add-World-Util-Methods.patch b/patches/server/0069-Add-World-Util-Methods.patch similarity index 96% rename from patches/server/0070-Add-World-Util-Methods.patch rename to patches/server/0069-Add-World-Util-Methods.patch index 7e3ff383eb..3302f66c6c 100644 --- a/patches/server/0070-Add-World-Util-Methods.patch +++ b/patches/server/0069-Add-World-Util-Methods.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods Methods that can be used for other patches to help improve logic. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 2ad216a533dedb180ea10d9072ce25ebe0283b1a..ad11ff50427177042b8f7331dddfc27f10657522 100644 +index 9c9c8178cd11e37aaef400e40092fb1095fa6c5f..d4b101d0f1835b57f34f68653d728df2bb78faa1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -219,7 +219,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0071-Custom-replacement-for-eaten-items.patch b/patches/server/0070-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/server/0071-Custom-replacement-for-eaten-items.patch rename to patches/server/0070-Custom-replacement-for-eaten-items.patch diff --git a/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0071-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 100% rename from patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to patches/server/0071-handle-NaN-health-absorb-values-and-repair-bad-data.patch diff --git a/patches/server/0073-Use-a-Shared-Random-for-Entities.patch b/patches/server/0072-Use-a-Shared-Random-for-Entities.patch similarity index 100% rename from patches/server/0073-Use-a-Shared-Random-for-Entities.patch rename to patches/server/0072-Use-a-Shared-Random-for-Entities.patch diff --git a/patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0073-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 100% rename from patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch rename to patches/server/0073-Configurable-spawn-chances-for-skeleton-horses.patch diff --git a/patches/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0074-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 98% rename from patches/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/server/0074-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch index 36f12d3949..5daeba23f9 100644 --- a/patches/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch +++ b/patches/server/0074-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch @@ -88,7 +88,7 @@ index 8033c8741a0f73919a357893652592b317bfb417..9a1cffd51aaf97f759a9057aefbf50bd @Override public FluidState getFluidState(BlockPos pos) { diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index b78e89eed44a06bb8c7a8a62e561574d4dc4b2de..ac67a34bee88e502b88a7cb7413f4ab33c7458b4 100644 +index ba24e32f96797ed8c8bd82391d1903f6ad2a9813..2efeccb33d1d5fb148a12f71eae870fbdcb6e0fd 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -342,12 +342,29 @@ public class LevelChunk extends ChunkAccess { diff --git a/patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 96% rename from patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to patches/server/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index 691b792b9e..50d683d3fd 100644 --- a/patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/patches/server/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener Saves on some object allocation and processing when no plugin listens to this diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8989d13eb6ee94a1dbbe986cfcf0755faaa4e85c..f725fbb64b7d801e4e4c7a6d5e1be6dd96cab047 100644 +index 28d58f402f15ee37cc1bfa3114839db281fc5f57..e62aa86afb05d8f00d8dd2b676407bfa7d0ed9fb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1357,6 +1357,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return worldserver + " " + worldserver.dimension().location(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index a99744982184649d927f72675f9cfd29e6909741..6f05f44f1123e1e152ec62d9c9f083c3d0046292 100644 +index 87a81cdd00b19ba020f6506eedd8ac4bf20d32ef..a487331d9df8fa0d58cfb0859c25a8fffe376ac2 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -218,6 +218,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0076-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/server/0076-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/server/0078-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0077-Configurable-Chunk-Inhabited-Time.patch similarity index 92% rename from patches/server/0078-Configurable-Chunk-Inhabited-Time.patch rename to patches/server/0077-Configurable-Chunk-Inhabited-Time.patch index 523e9bac95..83eb060041 100644 --- a/patches/server/0078-Configurable-Chunk-Inhabited-Time.patch +++ b/patches/server/0077-Configurable-Chunk-Inhabited-Time.patch @@ -11,7 +11,7 @@ For people who want all chunks to be treated equally, you can chose a fixed valu This allows to fine-tune vanilla gameplay. diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index ac67a34bee88e502b88a7cb7413f4ab33c7458b4..ef0be4f5ce7f07e38dea9eb356e049bd121c82dd 100644 +index 2efeccb33d1d5fb148a12f71eae870fbdcb6e0fd..b4c76e53eef8dc0efec98848352a243931ffc1f3 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -327,6 +327,13 @@ public class LevelChunk extends ChunkAccess { diff --git a/patches/server/0079-EntityPathfindEvent.patch b/patches/server/0078-EntityPathfindEvent.patch similarity index 100% rename from patches/server/0079-EntityPathfindEvent.patch rename to patches/server/0078-EntityPathfindEvent.patch diff --git a/patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0079-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 100% rename from patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch rename to patches/server/0079-Sanitise-RegionFileCache-and-make-configurable.patch diff --git a/patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0080-Do-not-load-chunks-for-Pathfinding.patch similarity index 100% rename from patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch rename to patches/server/0080-Do-not-load-chunks-for-Pathfinding.patch diff --git a/patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0081-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch rename to patches/server/0081-Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/server/0083-Configurable-Grass-Spread-Tick-Rate.patch b/patches/server/0082-Configurable-Grass-Spread-Tick-Rate.patch similarity index 100% rename from patches/server/0083-Configurable-Grass-Spread-Tick-Rate.patch rename to patches/server/0082-Configurable-Grass-Spread-Tick-Rate.patch diff --git a/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 100% rename from patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to patches/server/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch diff --git a/patches/server/0085-Optimize-DataBits.patch b/patches/server/0084-Optimize-DataBits.patch similarity index 100% rename from patches/server/0085-Optimize-DataBits.patch rename to patches/server/0084-Optimize-DataBits.patch diff --git a/patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 100% rename from patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to patches/server/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch diff --git a/patches/server/0087-Configurable-Player-Collision.patch b/patches/server/0086-Configurable-Player-Collision.patch similarity index 98% rename from patches/server/0087-Configurable-Player-Collision.patch rename to patches/server/0086-Configurable-Player-Collision.patch index f8398467c2..6d8be22412 100644 --- a/patches/server/0087-Configurable-Player-Collision.patch +++ b/patches/server/0086-Configurable-Player-Collision.patch @@ -43,7 +43,7 @@ index e62aa86afb05d8f00d8dd2b676407bfa7d0ed9fb..aab7ea2bbc9066b206b15cceb4db49aa this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP)); this.connection.acceptConnections(); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b33b5e731eaed8a3b42d4d318c41f8c6f1d6977c..0317839ee6f1bbfb20466334dd63ff0e7f7da5fb 100644 +index 22b9f0b3764907fc3c3d8bf8d42ef84ff237cd71..581cb78d5e96a6f34a16d4805410ca5ffc329068 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -98,6 +98,7 @@ import net.minecraft.world.level.storage.PlayerDataStorage; diff --git a/patches/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/server/0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/server/0089-Configurable-RCON-IP-address.patch b/patches/server/0088-Configurable-RCON-IP-address.patch similarity index 100% rename from patches/server/0089-Configurable-RCON-IP-address.patch rename to patches/server/0088-Configurable-RCON-IP-address.patch diff --git a/patches/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0089-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/server/0089-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/server/0091-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0090-Add-ability-to-configure-frosted_ice-properties.patch similarity index 100% rename from patches/server/0091-Add-ability-to-configure-frosted_ice-properties.patch rename to patches/server/0090-Add-ability-to-configure-frosted_ice-properties.patch diff --git a/patches/server/0092-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0091-remove-null-possibility-for-getServer-singleton.patch similarity index 95% rename from patches/server/0092-remove-null-possibility-for-getServer-singleton.patch rename to patches/server/0091-remove-null-possibility-for-getServer-singleton.patch index 9728fbb500..dde28793b1 100644 --- a/patches/server/0092-remove-null-possibility-for-getServer-singleton.patch +++ b/patches/server/0091-remove-null-possibility-for-getServer-singleton.patch @@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton to stop IDE complaining about potential NPE diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index aa70fb1160e8d88739ea372832a69569199ab8ab..dfb9bcfebb064a8445b19d149edcef45334367c5 100644 +index aab7ea2bbc9066b206b15cceb4db49aa230ebafd..3ed50490121f34ab5b247565b9a4555bf6a46dff 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -193,6 +193,7 @@ import co.aikar.timings.MinecraftTimings; // Paper diff --git a/patches/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0092-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 98% rename from patches/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/server/0092-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 01f53af301..c7288e0739 100644 --- a/patches/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/patches/server/0092-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -25,7 +25,7 @@ index 0d08690aade0e3334c583b62e0abf7bbab9a0c59..349a9f4596cd1411ec3a69cd7d6f5414 } } diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 08c76c56e493f01bc159312aef512886631682f3..379834a8b197a2f32aaebf4ebed635e7eba84479 100644 +index 60fb74537fdc96005cbf6aa1670e773c0faa2f26..7322c15921e05aaf0dafed89e1d90f2748efb2a9 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -758,6 +758,14 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0094-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/server/0093-LootTable-API-Replenishable-Lootables-Feature.patch similarity index 100% rename from patches/server/0094-LootTable-API-Replenishable-Lootables-Feature.patch rename to patches/server/0093-LootTable-API-Replenishable-Lootables-Feature.patch diff --git a/patches/server/0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0094-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 100% rename from patches/server/0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to patches/server/0094-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch diff --git a/patches/server/0096-System-property-for-disabling-watchdoge.patch b/patches/server/0095-System-property-for-disabling-watchdoge.patch similarity index 100% rename from patches/server/0096-System-property-for-disabling-watchdoge.patch rename to patches/server/0095-System-property-for-disabling-watchdoge.patch diff --git a/patches/server/0097-Async-GameProfileCache-saving.patch b/patches/server/0096-Async-GameProfileCache-saving.patch similarity index 97% rename from patches/server/0097-Async-GameProfileCache-saving.patch rename to patches/server/0096-Async-GameProfileCache-saving.patch index b010e736f7..f7d915bad3 100644 --- a/patches/server/0097-Async-GameProfileCache-saving.patch +++ b/patches/server/0096-Async-GameProfileCache-saving.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Async GameProfileCache saving diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index dfb9bcfebb064a8445b19d149edcef45334367c5..1ba7fe6b51b5e1555617bc65619c4ff82fd564cb 100644 +index 3ed50490121f34ab5b247565b9a4555bf6a46dff..0a419ec121bbddffa0424147c642f79d4e5eb817 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -934,7 +934,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop pendingBlockEntityTickers = Lists.newArrayList(); private boolean tickingBlockEntities; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 3ad15c0909d14c6f974e9bf82055c3c332577526..5a17b0c2e185bd50201a5d954322e41d42e2dae3 100644 +index 958c5faeddd3ee54ac2880eb3eb9e4ab2bba2540..3f6e5e4d36e8170def4ce50e29cdfcc7e25f4f4d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -151,6 +151,56 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0126-Enforce-Sync-Player-Saves.patch b/patches/server/0125-Enforce-Sync-Player-Saves.patch similarity index 92% rename from patches/server/0126-Enforce-Sync-Player-Saves.patch rename to patches/server/0125-Enforce-Sync-Player-Saves.patch index 5cc43229a2..2275c61795 100644 --- a/patches/server/0126-Enforce-Sync-Player-Saves.patch +++ b/patches/server/0125-Enforce-Sync-Player-Saves.patch @@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 796e8d85093756deb4bc25eb2af9981944ba1bf4..70b19aeba089f48cf53e259fce1339c7b31cd133 100644 +index 581cb78d5e96a6f34a16d4805410ca5ffc329068..ea2a07bc3395c884feac7d05d3fd41b5e10dc270 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1052,11 +1052,13 @@ public abstract class PlayerList { diff --git a/patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/server/0126-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 100% rename from patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch rename to patches/server/0126-Don-t-allow-entities-to-ride-themselves-572.patch diff --git a/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 99% rename from patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 0d4027161e..9e41b0f23a 100644 --- a/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -245,7 +245,7 @@ index 9bc9307966b77e34cb091fc895db3d3a66f7be82..e594cf4b8084b7448c29208a2070e766 } diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java -index 354fed07a1c8d88c97350be11388925e5bf82f9e..ff7b5fea13be9a64e5886f8fe337802cbc5d19b2 100644 +index 9d0df8d64a2cfd2458295a214829f277798030f0..75449d8575ac1b67aaa94d0f3fc08244728ec8a8 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java @@ -514,7 +514,7 @@ public class FishingHook extends Projectile { @@ -271,7 +271,7 @@ index db6b1a9804a6d75dce22b780044beb04ca69cc94..dcbbff3a8dfcac869f07025e0e8e3d9c } diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java -index ec7a95173a67052e841a3fe69a8d2621a1ccd2b9..9010656b7f013d50872017a298368ec8a3016e9c 100644 +index 3a4808cd669d68e030de081ba17e028cbb652386..e3c3d202a9852adf32d5e94c9011c3799668419b 100644 --- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java +++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java @@ -97,7 +97,7 @@ public class GrindstoneMenu extends AbstractContainerMenu { diff --git a/patches/server/0129-Cap-Entity-Collisions.patch b/patches/server/0128-Cap-Entity-Collisions.patch similarity index 100% rename from patches/server/0129-Cap-Entity-Collisions.patch rename to patches/server/0128-Cap-Entity-Collisions.patch diff --git a/patches/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from patches/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch rename to patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/patches/server/0131-Do-not-let-armorstands-drown.patch b/patches/server/0130-Do-not-let-armorstands-drown.patch similarity index 100% rename from patches/server/0131-Do-not-let-armorstands-drown.patch rename to patches/server/0130-Do-not-let-armorstands-drown.patch diff --git a/patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch similarity index 99% rename from patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch rename to patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch index 4b031cd667..a71fecdc13 100644 --- a/patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch +++ b/patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch @@ -64,7 +64,7 @@ index 0a419ec121bbddffa0424147c642f79d4e5eb817..ddc446e54b69c79fa0153478bb859bf9 if (waitForShutdown) { try { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b2cd38950587f404a53b81e1434a2039aa7b2f15..951246fe30327ac54a8e3e3685ad75841421cbc4 100644 +index ea2a07bc3395c884feac7d05d3fd41b5e10dc270..e6a47361db762bd4b54e28d3665a4aee72f91c19 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1164,8 +1164,15 @@ public abstract class PlayerList { diff --git a/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 92% rename from patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index f2bf5b5f78..de73ca1fc0 100644 --- a/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -14,7 +14,7 @@ To be converted into a Paper-API event at some point in the future? public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ad72e852e05c50effa195b112ff67b6d18a1eea2..ca894b92215f431a31b69ee2910ce023177f3e6e 100644 +index 15470487e8ea0dd36aa961e6f6ad124b3ba6dcc0..c2d6fa75164dd98ff012611d4da354a6b48cf058 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2327,6 +2327,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -32,7 +32,7 @@ index ad72e852e05c50effa195b112ff67b6d18a1eea2..ca894b92215f431a31b69ee2910ce023 case RELEASE_SHIFT_KEY: this.player.setShiftKeyDown(false); diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 379834a8b197a2f32aaebf4ebed635e7eba84479..a07ca7eca7ca38c47ae2c23f048c02a7869197aa 100644 +index 7322c15921e05aaf0dafed89e1d90f2748efb2a9..dbfb979a9ee826ed771da8d0593732ac74bc167b 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -583,7 +583,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 98% rename from patches/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch rename to patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch index bb254a9186..e5aeb6ced5 100644 --- a/patches/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -19,7 +19,7 @@ Other changes: configuration diff --git a/build.gradle.kts b/build.gradle.kts -index ebf3d64afbb5679b97a7565a2f8e5490e4a38275..8407beb0c47660f7d310d27f3a47120b80c5b189 100644 +index fc8a097b000e892630ddef00c350454a5f785281..c3072e478af4ab0c365790975f59880fd9bd7137 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,17 @@ plugins { @@ -222,7 +222,7 @@ index 35904c69e14c4c0addda204d5e3788518c2e16c4..e6826cd0a596f063e8737dcde3c8c6c5 System.setOut(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream()); System.setErr(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream()); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 67e13b8510eeecf16caae9fbbbeb463b794c460d..07be6f1e87b62772728abd2e48af91f1bd756a2e 100644 +index e6a47361db762bd4b54e28d3665a4aee72f91c19..30a017c54c334f0a8463186367c97c2cc5d06217 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -165,8 +165,7 @@ public abstract class PlayerList { @@ -262,7 +262,7 @@ index 5e4bd49319c20461d5828489d0379601e0398005..bc2bbddde33738db0e46f0dbe39fe62c @Override public PluginCommand getPluginCommand(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 1cbea000018436fcbc343e7512a0700c776d6441..75f5a3eb8730af1fea5bedbe168dcffacdbc85ad 100644 +index 47c97c16eb23cdd485858c39c571a7ef5ac6d594..7004baa10a6df287239db868dce64d054105040c 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -12,7 +12,7 @@ import java.util.logging.Level; diff --git a/patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 100% rename from patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch rename to patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch diff --git a/patches/server/0137-Item-canEntityPickup.patch b/patches/server/0136-Item-canEntityPickup.patch similarity index 100% rename from patches/server/0137-Item-canEntityPickup.patch rename to patches/server/0136-Item-canEntityPickup.patch diff --git a/patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/server/0139-PlayerAttemptPickupItemEvent.patch b/patches/server/0138-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/server/0139-PlayerAttemptPickupItemEvent.patch rename to patches/server/0138-PlayerAttemptPickupItemEvent.patch diff --git a/patches/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0141-Add-UnknownCommandEvent.patch b/patches/server/0140-Add-UnknownCommandEvent.patch similarity index 92% rename from patches/server/0141-Add-UnknownCommandEvent.patch rename to patches/server/0140-Add-UnknownCommandEvent.patch index 8d8c45d1f2..0bf0f31bc4 100644 --- a/patches/server/0141-Add-UnknownCommandEvent.patch +++ b/patches/server/0140-Add-UnknownCommandEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 565f9d18b529974c53e6aa8cefa5fc01ad7ad0fd..19386ae876637051f42567acc5749dc13b5e71f6 100644 +index bc2bbddde33738db0e46f0dbe39fe62c6d34126b..d53d3a29ab58966dafae76c69d9a68dccbae4de6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -905,7 +905,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0142-Basic-PlayerProfile-API.patch b/patches/server/0141-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/server/0142-Basic-PlayerProfile-API.patch rename to patches/server/0141-Basic-PlayerProfile-API.patch diff --git a/patches/server/0143-Shoulder-Entities-Release-API.patch b/patches/server/0142-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/server/0143-Shoulder-Entities-Release-API.patch rename to patches/server/0142-Shoulder-Entities-Release-API.patch diff --git a/patches/server/0144-Profile-Lookup-Events.patch b/patches/server/0143-Profile-Lookup-Events.patch similarity index 100% rename from patches/server/0144-Profile-Lookup-Events.patch rename to patches/server/0143-Profile-Lookup-Events.patch diff --git a/patches/server/0145-Block-player-logins-during-server-shutdown.patch b/patches/server/0144-Block-player-logins-during-server-shutdown.patch similarity index 92% rename from patches/server/0145-Block-player-logins-during-server-shutdown.patch rename to patches/server/0144-Block-player-logins-during-server-shutdown.patch index 44f91d0f0d..d034ffd001 100644 --- a/patches/server/0145-Block-player-logins-during-server-shutdown.patch +++ b/patches/server/0144-Block-player-logins-during-server-shutdown.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Block player logins during server shutdown diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index d14b7265a075f883f39d078b0d57bccdd7b3ff41..0d55dc89e4577fb6804e08281aaa12ac783bbbe0 100644 +index 453a9dd794c39be5e7221b05fabb71b802691003..897b72d230976594c33cdb80706e9ce594d0b0f5 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -71,6 +71,12 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0146-Entity-fromMobSpawner.patch b/patches/server/0145-Entity-fromMobSpawner.patch similarity index 97% rename from patches/server/0146-Entity-fromMobSpawner.patch rename to patches/server/0145-Entity-fromMobSpawner.patch index 7e2129fe2d..a26f31e6ce 100644 --- a/patches/server/0146-Entity-fromMobSpawner.patch +++ b/patches/server/0145-Entity-fromMobSpawner.patch @@ -37,7 +37,7 @@ index 760596375e26b4cd73cc378758f4bf761c3352a5..66b727c533d3a2b7b5938ab9b9b7b4a7 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index cf9a0addcbec3f78a541fad85697961ed8ec884b..6b6f81f3e9e55c1f41599ccbf65e35d79749a77d 100644 +index b214a79efc4f5279d3dd29feb1f79efc45788a8d..7e436a2cbf1920c985cb9febf1839adc589c2619 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -163,6 +163,7 @@ public abstract class BaseSpawner { diff --git a/patches/server/0147-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0146-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/server/0147-Improve-the-Saddle-API-for-Horses.patch rename to patches/server/0146-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/server/0148-Implement-ensureServerConversions-API.patch b/patches/server/0147-Implement-ensureServerConversions-API.patch similarity index 100% rename from patches/server/0148-Implement-ensureServerConversions-API.patch rename to patches/server/0147-Implement-ensureServerConversions-API.patch diff --git a/patches/server/0149-Implement-getI18NDisplayName.patch b/patches/server/0148-Implement-getI18NDisplayName.patch similarity index 100% rename from patches/server/0149-Implement-getI18NDisplayName.patch rename to patches/server/0148-Implement-getI18NDisplayName.patch diff --git a/patches/server/0150-ProfileWhitelistVerifyEvent.patch b/patches/server/0149-ProfileWhitelistVerifyEvent.patch similarity index 97% rename from patches/server/0150-ProfileWhitelistVerifyEvent.patch rename to patches/server/0149-ProfileWhitelistVerifyEvent.patch index cef6b13bc1..2d58743d63 100644 --- a/patches/server/0150-ProfileWhitelistVerifyEvent.patch +++ b/patches/server/0149-ProfileWhitelistVerifyEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 07be6f1e87b62772728abd2e48af91f1bd756a2e..216ad4d729d8996bb4f5bc696fd168f65b076994 100644 +index 30a017c54c334f0a8463186367c97c2cc5d06217..5b5f7aefd2e2a7c977605c84a9c005eb4afe4ba3 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -629,9 +629,9 @@ public abstract class PlayerList { diff --git a/patches/server/0151-Fix-this-stupid-bullshit.patch b/patches/server/0150-Fix-this-stupid-bullshit.patch similarity index 100% rename from patches/server/0151-Fix-this-stupid-bullshit.patch rename to patches/server/0150-Fix-this-stupid-bullshit.patch diff --git a/patches/server/0152-LivingEntity-setKiller.patch b/patches/server/0151-LivingEntity-setKiller.patch similarity index 100% rename from patches/server/0152-LivingEntity-setKiller.patch rename to patches/server/0151-LivingEntity-setKiller.patch diff --git a/patches/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from patches/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/patches/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 92% rename from patches/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch index 60b98d70d9..eac12bfb53 100644 --- a/patches/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch +++ b/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset spawner timer when spawner event is cancelled diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index 6b6f81f3e9e55c1f41599ccbf65e35d79749a77d..e9e0286083337ccd027e01ec80125fc69550ad07 100644 +index 7e436a2cbf1920c985cb9febf1839adc589c2619..b3df6184b1b7f7e3b5cf87c76acb7f103e0dc1db 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -164,6 +164,7 @@ public abstract class BaseSpawner { diff --git a/patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 93% rename from patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch rename to patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch index dbab45944c..0093a6dd86 100644 --- a/patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch +++ b/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 0d55dc89e4577fb6804e08281aaa12ac783bbbe0..9cbd0174ca4cd4a74a04295d34217c1581ca3912 100644 +index 897b72d230976594c33cdb80706e9ce594d0b0f5..3813f62907e6582b5fa310d3df750f4a460188d4 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -294,7 +294,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0156-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 97% rename from patches/server/0156-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch index c66caac139..d4753f531e 100644 --- a/patches/server/0156-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/build.gradle.kts b/build.gradle.kts -index 8407beb0c47660f7d310d27f3a47120b80c5b189..8f8e6dea5f5f2a537a753efcc38484e3cd6a888f 100644 +index c3072e478af4ab0c365790975f59880fd9bd7137..ea302ff922bd449b2b2cdbe92d21dc704dc456e3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { diff --git a/patches/server/0157-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch similarity index 100% rename from patches/server/0157-Improve-Log4J-Configuration-Plugin-Loggers.patch rename to patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch diff --git a/patches/server/0158-Add-PlayerJumpEvent.patch b/patches/server/0157-Add-PlayerJumpEvent.patch similarity index 96% rename from patches/server/0158-Add-PlayerJumpEvent.patch rename to patches/server/0157-Add-PlayerJumpEvent.patch index 4e519fc404..a2c0798ac2 100644 --- a/patches/server/0158-Add-PlayerJumpEvent.patch +++ b/patches/server/0157-Add-PlayerJumpEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ca894b92215f431a31b69ee2910ce023177f3e6e..f4f7d9947edc35e02739adc06a8f3c3c2a431771 100644 +index c2d6fa75164dd98ff012611d4da354a6b48cf058..4d768673a70a1b7008572a9bc331e4d7de6990d8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1285,7 +1285,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0159-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch similarity index 100% rename from patches/server/0159-handle-ServerboundKeepAlivePacket-async.patch rename to patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch diff --git a/patches/server/0160-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch similarity index 97% rename from patches/server/0160-Expose-client-protocol-version-and-virtual-host.patch rename to patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch index 55365ed44a..cb5c14c4b7 100644 --- a/patches/server/0160-Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch @@ -90,7 +90,7 @@ index 8284d49c8e30645d00be952c847bab7ce5753d78..a738b79e775a0a4abed1a05e12495d85 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 98d8585a8bc2acbb8d98c73e3aca404f0ebe66d3..70e5ef461f02e6aa8a73363753687d0cf5e7c4fb 100644 +index 3f1ed61a120f7adebfba2741a8c671a1e464471b..dfabf22bb14bbbd6b2d2b9beafa3815303f32f7f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -301,6 +301,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0161-revert-serverside-behavior-of-keepalives.patch b/patches/server/0160-revert-serverside-behavior-of-keepalives.patch similarity index 97% rename from patches/server/0161-revert-serverside-behavior-of-keepalives.patch rename to patches/server/0160-revert-serverside-behavior-of-keepalives.patch index 94afb41c3e..01e66ffdcb 100644 --- a/patches/server/0161-revert-serverside-behavior-of-keepalives.patch +++ b/patches/server/0160-revert-serverside-behavior-of-keepalives.patch @@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients, at the cost of dead connections being kept open for longer. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f774583cce32d70f32ed7dd0ec1b45b8f00b029a..0e4691ab7ad4459282398e4c2160df4e442fdcb4 100644 +index 12e3f10ff7134191c50faa0b84578546399d1b56..66436cd5b6b14914919a1eb612ca133ee4ffef05 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -255,7 +255,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0162-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 98% rename from patches/server/0162-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch index c704b3d731..340f596b6f 100644 --- a/patches/server/0162-Send-attack-SoundEffects-only-to-players-who-can-see.patch +++ b/patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 05b32ac76dbc3c0a16380cab82415dac6aff25de..3cdc77d9dbc39a99a7f47aad03e8ab0d05270d61 100644 +index 095d459962841f7247a9365aff3bdf83bc0b3589..4066cde038732fadad753b0b5a1ca14d95aee0b0 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1228,7 +1228,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0163-Add-PlayerArmorChangeEvent.patch b/patches/server/0162-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/server/0163-Add-PlayerArmorChangeEvent.patch rename to patches/server/0162-Add-PlayerArmorChangeEvent.patch diff --git a/patches/server/0164-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 92% rename from patches/server/0164-Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch index ea3917b242..6e007eef98 100644 --- a/patches/server/0164-Prevent-logins-from-being-processed-when-the-player-.patch +++ b/patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 9cbd0174ca4cd4a74a04295d34217c1581ca3912..b2a7fc9bc4a168304f83411559558e3a218934a4 100644 +index 3813f62907e6582b5fa310d3df750f4a460188d4..82b1bdc0e4bce2762fa226fb54d9945dc1e5c736 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -78,7 +78,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 100% rename from patches/server/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch diff --git a/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch similarity index 100% rename from patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch rename to patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch diff --git a/patches/server/0167-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/server/0167-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/server/0168-AsyncTabCompleteEvent.patch b/patches/server/0167-AsyncTabCompleteEvent.patch similarity index 99% rename from patches/server/0168-AsyncTabCompleteEvent.patch rename to patches/server/0167-AsyncTabCompleteEvent.patch index 6e3ae3d384..d85432e297 100644 --- a/patches/server/0168-AsyncTabCompleteEvent.patch +++ b/patches/server/0167-AsyncTabCompleteEvent.patch @@ -16,7 +16,7 @@ Also adds isCommand and getLocation to the sync TabCompleteEvent Co-authored-by: Aikar diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fb2918f3f99bae7b549412712adeeb55a45c9e9b..c8193e4fc77612f4535f360777dbe93f75b5be4e 100644 +index 66436cd5b6b14914919a1eb612ca133ee4ffef05..43748cb2ee5840ee82d5ab6337a72c863fe06d3d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -776,12 +776,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0169-PlayerPickupExperienceEvent.patch b/patches/server/0168-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/server/0169-PlayerPickupExperienceEvent.patch rename to patches/server/0168-PlayerPickupExperienceEvent.patch diff --git a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch similarity index 96% rename from patches/server/0170-Ability-to-apply-mending-to-XP-API.patch rename to patches/server/0169-Ability-to-apply-mending-to-XP-API.patch index 797b38aaf2..89bd767245 100644 --- a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch +++ b/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch @@ -14,7 +14,7 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6a8241e0def767a0ae17a11df81357022086d8bb..a3eb4c8fbeb9ba708b00ddf06255a2e13692d07c 100644 +index dfabf22bb14bbbd6b2d2b9beafa3815303f32f7f..d7d47a3dce2c15d39531344a9eaac3990dc1dfc2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1460,7 +1460,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch similarity index 96% rename from patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch index efa1b7fa0a..a9085cc493 100644 --- a/patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch +++ b/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch @@ -9,7 +9,7 @@ from triggering monster spawns on a server. Also a highly more effecient way to blanket block spawns in a world diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 159269d15c95261bddd410e337132c67d13c273c..c6706c3d7841869134be89dd09ea723820d306a2 100644 +index 3c5b6231dc6f3dcc275e032d03989ed638fb03a9..61039a4b61317e293ea054a6a2c0e849e5a302f0 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -692,7 +692,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -60,7 +60,7 @@ index 80d108ae7faf3fdcb024931e93032215935fe70b..c021733342c09adb04ce3f675209543f while (iterator1.hasNext()) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 1d04f135f33e9db68153f5db19360f30aa0113eb..6460e922056b2f349bdc9299920dc7236c4cb695 100644 +index dc0c89e39f291e735fc1dbf3ccf262a5b4f22459..673252f54103a7ab34650db85d6200953755c745 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0172-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0172-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0173-PreCreatureSpawnEvent.patch b/patches/server/0172-PreCreatureSpawnEvent.patch similarity index 98% rename from patches/server/0173-PreCreatureSpawnEvent.patch rename to patches/server/0172-PreCreatureSpawnEvent.patch index 0ae3bab044..f5379c5ec4 100644 --- a/patches/server/0173-PreCreatureSpawnEvent.patch +++ b/patches/server/0172-PreCreatureSpawnEvent.patch @@ -59,7 +59,7 @@ index 1b3c7b3fb869215badacdb604199d5b96f74e384..83ef8cb27db685cceb5c2b7c9674e17b if (t0 != null) { diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index 2e392630d3b4b08ff8ab82b7f8b32b7fbf21570d..cb1fe497477d6850260b09dcfbf290119ff6ab49 100644 +index a2c4267f0001b276d848377e4dbcc407ee8d1ff9..c33550137ea83f23885341545c4a7f4985e07cfc 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java @@ -405,6 +405,20 @@ public class EntityType implements FeatureElement, EntityTypeT @@ -97,7 +97,7 @@ index bbbb26550b0c5b36d9c7204f075aa90b79b85ff0..bc778aadb2604756b783d4d024e31545 } } diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index e9e0286083337ccd027e01ec80125fc69550ad07..23cecd12f064f70d314393971312d881cace043a 100644 +index b3df6184b1b7f7e3b5cf87c76acb7f103e0dc1db..64d1f0ed579ef6f6f2e24e795d8dd0e1bdb5f39d 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -128,6 +128,27 @@ public abstract class BaseSpawner { diff --git a/patches/server/0174-Fill-Profile-Property-Events.patch b/patches/server/0173-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0174-Fill-Profile-Property-Events.patch rename to patches/server/0173-Fill-Profile-Property-Events.patch diff --git a/patches/server/0175-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0174-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0175-PlayerAdvancementCriterionGrantEvent.patch rename to patches/server/0174-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0176-Add-ArmorStand-Item-Meta.patch b/patches/server/0175-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/0176-Add-ArmorStand-Item-Meta.patch rename to patches/server/0175-Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/0177-Extend-Player-Interact-cancellation.patch b/patches/server/0176-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0177-Extend-Player-Interact-cancellation.patch rename to patches/server/0176-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0178-Tameable-getOwnerUniqueId-API.patch b/patches/server/0177-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0178-Tameable-getOwnerUniqueId-API.patch rename to patches/server/0177-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 91% rename from patches/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch index eeb0dc7e22..59a00b028b 100644 --- a/patches/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch +++ b/patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients. diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index acd84748204bad0dbfc59fbd516f873e0aa16a40..2e547db9c4c06a22406495fda83def1c275c0944 100644 +index 4066cde038732fadad753b0b5a1ca14d95aee0b0..8fc8e7a6fff002a6022f5a4579a229238af08348 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1235,6 +1235,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0181-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0180-Implement-extended-PaperServerListPingEvent.patch similarity index 99% rename from patches/server/0181-Implement-extended-PaperServerListPingEvent.patch rename to patches/server/0180-Implement-extended-PaperServerListPingEvent.patch index bfc5e21dcc..3279220072 100644 --- a/patches/server/0181-Implement-extended-PaperServerListPingEvent.patch +++ b/patches/server/0180-Implement-extended-PaperServerListPingEvent.patch @@ -190,7 +190,7 @@ index 67455a5ba75c9b816213e44d6872c5ddf8e27e98..23efad80934930beadf15e65781551d4 public ClientboundStatusResponsePacket(ServerStatus metadata) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ece65ae90a71517a374a3ebbe0cb0ba514b44e2f..2b55df58684a19519335666858bc79de8067faf7 100644 +index fc040a4424144ecae03a039899f53227777cce05..bb7da8b167b72f2b1fec2be8838545ae4ed71eb3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2,6 +2,9 @@ package net.minecraft.server; diff --git a/patches/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 95% rename from patches/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 5d1a658e63..6cc179b1ca 100644 --- a/patches/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent This will allow you to change the players name or skin on login. diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index b2a7fc9bc4a168304f83411559558e3a218934a4..bb5c4ecd43aa344dfe9cca8ab7c2ebf9760e94cf 100644 +index 82b1bdc0e4bce2762fa226fb54d9945dc1e5c736..b1fa2b95e161996cb62f05b67d710c0f9a98b1b2 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -329,8 +329,16 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0183-Player.setPlayerProfile-API.patch b/patches/server/0182-Player.setPlayerProfile-API.patch similarity index 99% rename from patches/server/0183-Player.setPlayerProfile-API.patch rename to patches/server/0182-Player.setPlayerProfile-API.patch index 75289356ab..389f3b8dc7 100644 --- a/patches/server/0183-Player.setPlayerProfile-API.patch +++ b/patches/server/0182-Player.setPlayerProfile-API.patch @@ -42,7 +42,7 @@ index e7442952ef1f03969949014492a7ddc6d0796ba5..69a1852905dd4724c30ac8ab88c14251 public Server getServer() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a3eb4c8fbeb9ba708b00ddf06255a2e13692d07c..8d6145797f36b48a033c8c0ada6d43749411d3b9 100644 +index d7d47a3dce2c15d39531344a9eaac3990dc1dfc2..19a440e12248b4f52c2ae2401d6ae4eb39ac4379 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -81,6 +81,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes; diff --git a/patches/server/0184-getPlayerUniqueId-API.patch b/patches/server/0183-getPlayerUniqueId-API.patch similarity index 100% rename from patches/server/0184-getPlayerUniqueId-API.patch rename to patches/server/0183-getPlayerUniqueId-API.patch diff --git a/patches/server/0185-Improved-Async-Task-Scheduler.patch b/patches/server/0184-Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/0185-Improved-Async-Task-Scheduler.patch rename to patches/server/0184-Improved-Async-Task-Scheduler.patch diff --git a/patches/server/0186-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0185-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/0186-Make-legacy-ping-handler-more-reliable.patch rename to patches/server/0185-Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/0188-Flag-to-disable-the-channel-limit.patch b/patches/server/0187-Flag-to-disable-the-channel-limit.patch similarity index 100% rename from patches/server/0188-Flag-to-disable-the-channel-limit.patch rename to patches/server/0187-Flag-to-disable-the-channel-limit.patch diff --git a/patches/server/0189-Add-openSign-method-to-HumanEntity.patch b/patches/server/0188-Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/server/0189-Add-openSign-method-to-HumanEntity.patch rename to patches/server/0188-Add-openSign-method-to-HumanEntity.patch diff --git a/patches/server/0190-Configurable-sprint-interruption-on-attack.patch b/patches/server/0189-Configurable-sprint-interruption-on-attack.patch similarity index 92% rename from patches/server/0190-Configurable-sprint-interruption-on-attack.patch rename to patches/server/0189-Configurable-sprint-interruption-on-attack.patch index fde468df9e..3fc16e4732 100644 --- a/patches/server/0190-Configurable-sprint-interruption-on-attack.patch +++ b/patches/server/0189-Configurable-sprint-interruption-on-attack.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack If the sprint interruption is disabled players continue sprinting when they attack entities. diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 2e547db9c4c06a22406495fda83def1c275c0944..e088e5174a4666130cd1f66c751e7ab83d9f7a65 100644 +index 8fc8e7a6fff002a6022f5a4579a229238af08348..3bdd77d2e91be5182c32761f736e7cccccb08978 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1284,7 +1284,11 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0190-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 100% rename from patches/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/server/0190-Fix-exploit-that-allowed-colored-signs-to-be-created.patch diff --git a/patches/server/0192-EndermanEscapeEvent.patch b/patches/server/0191-EndermanEscapeEvent.patch similarity index 100% rename from patches/server/0192-EndermanEscapeEvent.patch rename to patches/server/0191-EndermanEscapeEvent.patch diff --git a/patches/server/0193-Enderman.teleportRandomly.patch b/patches/server/0192-Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/0193-Enderman.teleportRandomly.patch rename to patches/server/0192-Enderman.teleportRandomly.patch diff --git a/patches/server/0194-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0193-Block-Enderpearl-Travel-Exploit.patch similarity index 96% rename from patches/server/0194-Block-Enderpearl-Travel-Exploit.patch rename to patches/server/0193-Block-Enderpearl-Travel-Exploit.patch index 118b98f199..639481f1b7 100644 --- a/patches/server/0194-Block-Enderpearl-Travel-Exploit.patch +++ b/patches/server/0193-Block-Enderpearl-Travel-Exploit.patch @@ -33,7 +33,7 @@ index 349a9f4596cd1411ec3a69cd7d6f5414971b74ef..45485383943f1ae0d4c5b5064cbaa8f5 public void onTrackingStart(Entity entity) { diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index a5f018514d08f2563d5f18f4d787181e83c7cbef..d8760dd282221fa10b486f1ec4634c1aafd9c26e 100644 +index e19251bc9cb18ea3c37628b55ae73bb2e5ba69bd..95ee8f85dd7e6c32f751f5c754a351cc7bcd6245 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java @@ -89,6 +89,7 @@ public abstract class Projectile extends Entity { diff --git a/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0194-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/server/0194-Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from patches/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/patches/server/0197-EndermanAttackPlayerEvent.patch b/patches/server/0196-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/0197-EndermanAttackPlayerEvent.patch rename to patches/server/0196-EndermanAttackPlayerEvent.patch diff --git a/patches/server/0198-WitchConsumePotionEvent.patch b/patches/server/0197-WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/0198-WitchConsumePotionEvent.patch rename to patches/server/0197-WitchConsumePotionEvent.patch diff --git a/patches/server/0199-WitchThrowPotionEvent.patch b/patches/server/0198-WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/0199-WitchThrowPotionEvent.patch rename to patches/server/0198-WitchThrowPotionEvent.patch diff --git a/patches/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from patches/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/patches/server/0201-WitchReadyPotionEvent.patch b/patches/server/0200-WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/0201-WitchReadyPotionEvent.patch rename to patches/server/0200-WitchReadyPotionEvent.patch diff --git a/patches/server/0202-ItemStack-getMaxItemUseDuration.patch b/patches/server/0201-ItemStack-getMaxItemUseDuration.patch similarity index 91% rename from patches/server/0202-ItemStack-getMaxItemUseDuration.patch rename to patches/server/0201-ItemStack-getMaxItemUseDuration.patch index 2969876aa2..c2d2d5a50d 100644 --- a/patches/server/0202-ItemStack-getMaxItemUseDuration.patch +++ b/patches/server/0201-ItemStack-getMaxItemUseDuration.patch @@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration Allows you to determine how long it takes to use a usable/consumable item diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index be2e114ed21344c9336b920238d0ee575b8d342b..6f1bc67038fd6d8c3c31ef33ae19a014d0976bf6 100644 +index 3c3f5a4b7109ec8b47b550f9e766556f8d1546ec..8b3cc7b9ea8ef3ddd619bc4a6affb5bb38cad8c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -173,6 +173,13 @@ public final class CraftItemStack extends ItemStack { diff --git a/patches/server/0203-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0203-Implement-EntityTeleportEndGatewayEvent.patch rename to patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch diff --git a/patches/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/0205-Fix-CraftEntity-hashCode.patch b/patches/server/0204-Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/0205-Fix-CraftEntity-hashCode.patch rename to patches/server/0204-Fix-CraftEntity-hashCode.patch diff --git a/patches/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from patches/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch rename to patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/patches/server/0207-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/0207-Print-Error-details-when-failing-to-save-player-data.patch rename to patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/0208-Make-shield-blocking-delay-configurable.patch b/patches/server/0207-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/server/0208-Make-shield-blocking-delay-configurable.patch rename to patches/server/0207-Make-shield-blocking-delay-configurable.patch diff --git a/patches/server/0209-Improve-EntityShootBowEvent.patch b/patches/server/0208-Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/0209-Improve-EntityShootBowEvent.patch rename to patches/server/0208-Improve-EntityShootBowEvent.patch diff --git a/patches/server/0210-PlayerReadyArrowEvent.patch b/patches/server/0209-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/0210-PlayerReadyArrowEvent.patch rename to patches/server/0209-PlayerReadyArrowEvent.patch diff --git a/patches/server/0211-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch similarity index 98% rename from patches/server/0211-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch rename to patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch index 8255ea5bd9..d414ead935 100644 --- a/patches/server/0211-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch +++ b/patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch @@ -161,7 +161,7 @@ index 127948e7c8620de1f4fabce0d654fbb502510156..191f7afcb23b5ee58df9dd6bd8c78ac9 } } diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index b6027f4f5f747b81062d83ef7a3f62d420832729..811ab2a967db7a6767c98869034ea75bd443f301 100644 +index 2010e93da4e56a6a22a8e6f8c42a799eeba62acc..67da749cef5241d6cbe02a494e43ae8fb24bb56d 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1278,9 +1278,9 @@ public abstract class Player extends LivingEntity { @@ -186,7 +186,7 @@ index b6027f4f5f747b81062d83ef7a3f62d420832729..811ab2a967db7a6767c98869034ea75b // CraftBukkit end } diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index cfd202d32048abcd3e961d9f7f08c1bc6282e601..0057c96609bf657ff1282a0a6cc78bdc4bc68f92 100644 +index d4b8364fd860ee2cc632d8c752435b9b311c7ece..915c15faa510f4bdd3a96d8ba83280f08b12dec6 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -401,7 +401,7 @@ public abstract class AbstractArrow extends Projectile { diff --git a/patches/server/0212-Expand-Explosions-API.patch b/patches/server/0211-Expand-Explosions-API.patch similarity index 94% rename from patches/server/0212-Expand-Explosions-API.patch rename to patches/server/0211-Expand-Explosions-API.patch index 73ea8df568..666ee81c29 100644 --- a/patches/server/0212-Expand-Explosions-API.patch +++ b/patches/server/0211-Expand-Explosions-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 164b54410ecfe68a6d6239baf6e0e3699fbafbde..8cbc73148f9d5fc4a76637812b448c3e09ba430c 100644 +index 68e3a09bf4adb4fe9fc3c32fdec85d90af4354bc..51689ecd87a4afcc24786f3feb82b4d0c23b2732 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -702,6 +702,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/server/0214-RangedEntity-API.patch b/patches/server/0213-RangedEntity-API.patch similarity index 100% rename from patches/server/0214-RangedEntity-API.patch rename to patches/server/0213-RangedEntity-API.patch diff --git a/patches/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0216-Implement-World.getEntity-UUID-API.patch b/patches/server/0215-Implement-World.getEntity-UUID-API.patch similarity index 91% rename from patches/server/0216-Implement-World.getEntity-UUID-API.patch rename to patches/server/0215-Implement-World.getEntity-UUID-API.patch index 3071dcd6fc..c8a4dc7d20 100644 --- a/patches/server/0216-Implement-World.getEntity-UUID-API.patch +++ b/patches/server/0215-Implement-World.getEntity-UUID-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 776bbbbeae53cc6a89546f571b07b0c13376f29a..b10f4e4bb39f4de1aba4f6949843fa3786cedc62 100644 +index 51689ecd87a4afcc24786f3feb82b4d0c23b2732..78ca1045257fa0771ddea44629e09cfac8f88ca3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1036,6 +1036,15 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0217-InventoryCloseEvent-Reason-API.patch b/patches/server/0216-InventoryCloseEvent-Reason-API.patch similarity index 98% rename from patches/server/0217-InventoryCloseEvent-Reason-API.patch rename to patches/server/0216-InventoryCloseEvent-Reason-API.patch index 945be534bd..8af8925945 100644 --- a/patches/server/0217-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0216-InventoryCloseEvent-Reason-API.patch @@ -29,7 +29,7 @@ index d17808f6c565712dac31b0db7a4b6baed2dbdf21..8b28de5755ad4fe50903837700feed32 } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 0e64cb9969453832c5d08b112cafb9ef835f9a2a..cd392d316f35ac488c49ad8c34c0273bbccc6a1c 100644 +index 673252f54103a7ab34650db85d6200953755c745..ab71db25415e87e2ebd299e4d491be5e08820c21 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -633,7 +633,7 @@ public class ServerPlayer extends Player { @@ -117,7 +117,7 @@ index 5b5f7aefd2e2a7c977605c84a9c005eb4afe4ba3..590cffbbccb1f6ce4bd9abfe036c0819 PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : PaperAdventure.asAdventure(entityplayer.getDisplayName()))); // Paper - Adventure diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index e68586fcabc31f9085fe6e49cf05b76c45a9bcf5..db0b9884455e1d0f374ad802f6bc549d8640f511 100644 +index 67da749cef5241d6cbe02a494e43ae8fb24bb56d..48b18b824935ef922fe9f7e5860f923688a0ccc0 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -265,7 +265,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0218-Vex-get-setSummoner-API.patch b/patches/server/0217-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0218-Vex-get-setSummoner-API.patch rename to patches/server/0217-Vex-get-setSummoner-API.patch diff --git a/patches/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from patches/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/patches/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 94% rename from patches/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index 81095bd2eb..2f582e3fc3 100644 --- a/patches/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread diff --git a/build.gradle.kts b/build.gradle.kts -index 8f8e6dea5f5f2a537a753efcc38484e3cd6a888f..28ca89a36d9cf9b7aca51a21be89e220c8e07589 100644 +index ea302ff922bd449b2b2cdbe92d21dc704dc456e3..cf7bebb51e4eb0389dab181dacf7c6b0d7be7014 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,6 +26,7 @@ dependencies { diff --git a/patches/server/0221-add-more-information-to-Entity.toString.patch b/patches/server/0220-add-more-information-to-Entity.toString.patch similarity index 100% rename from patches/server/0221-add-more-information-to-Entity.toString.patch rename to patches/server/0220-add-more-information-to-Entity.toString.patch diff --git a/patches/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch similarity index 100% rename from patches/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch rename to patches/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch diff --git a/patches/server/0223-EnderDragon-Events.patch b/patches/server/0222-EnderDragon-Events.patch similarity index 100% rename from patches/server/0223-EnderDragon-Events.patch rename to patches/server/0222-EnderDragon-Events.patch diff --git a/patches/server/0224-PlayerElytraBoostEvent.patch b/patches/server/0223-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0224-PlayerElytraBoostEvent.patch rename to patches/server/0223-PlayerElytraBoostEvent.patch diff --git a/patches/server/0225-PlayerLaunchProjectileEvent.patch b/patches/server/0224-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0225-PlayerLaunchProjectileEvent.patch rename to patches/server/0224-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0226-Improve-BlockPosition-inlining.patch b/patches/server/0225-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0226-Improve-BlockPosition-inlining.patch rename to patches/server/0225-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/patches/server/0228-Vanished-players-don-t-have-rights.patch b/patches/server/0227-Vanished-players-don-t-have-rights.patch similarity index 98% rename from patches/server/0228-Vanished-players-don-t-have-rights.patch rename to patches/server/0227-Vanished-players-don-t-have-rights.patch index 28dcf50d54..3aed2f330a 100644 --- a/patches/server/0228-Vanished-players-don-t-have-rights.patch +++ b/patches/server/0227-Vanished-players-don-t-have-rights.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Vanished players don't have rights diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index d8760dd282221fa10b486f1ec4634c1aafd9c26e..11cfe63c101f5d76d3481a3163dbaec22685ccce 100644 +index 95ee8f85dd7e6c32f751f5c754a351cc7bcd6245..ec5fc3293097b364b5f6d8acc756aa8adde15215 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java @@ -212,7 +212,14 @@ public abstract class Projectile extends Entity { diff --git a/patches/server/0229-Allow-disabling-armour-stand-ticking.patch b/patches/server/0228-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/server/0229-Allow-disabling-armour-stand-ticking.patch rename to patches/server/0228-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/server/0230-SkeletonHorse-Additions.patch b/patches/server/0229-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0230-SkeletonHorse-Additions.patch rename to patches/server/0229-SkeletonHorse-Additions.patch diff --git a/patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/0232-Implement-Expanded-ArmorStand-API.patch b/patches/server/0231-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/server/0232-Implement-Expanded-ArmorStand-API.patch rename to patches/server/0231-Implement-Expanded-ArmorStand-API.patch diff --git a/patches/server/0233-AnvilDamageEvent.patch b/patches/server/0232-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0233-AnvilDamageEvent.patch rename to patches/server/0232-AnvilDamageEvent.patch diff --git a/patches/server/0234-Add-TNTPrimeEvent.patch b/patches/server/0233-Add-TNTPrimeEvent.patch similarity index 98% rename from patches/server/0234-Add-TNTPrimeEvent.patch rename to patches/server/0233-Add-TNTPrimeEvent.patch index 55aa436662..580d91bcd1 100644 --- a/patches/server/0234-Add-TNTPrimeEvent.patch +++ b/patches/server/0233-Add-TNTPrimeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java -index a889be9dd2a94b531a227ff69a5e761e103067be..3b14fd5d67716a5b3610c10e8105d29f93a1d7a9 100644 +index 7bf3ad1ccef09b697655dc949abab9ab006a95a9..c9051e80d329f1b10fa04d21f8891e85c44b5200 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java @@ -532,6 +532,11 @@ public class EnderDragon extends Mob implements Enemy { diff --git a/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 97% rename from patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch index fd3ca17b01..8f182e4bc9 100644 --- a/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch @@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on plugins doing unsafe things. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 867478671d3223338bf01a36da0361a5ae1f38be..c5ad4d8a08f03a6f75241f4e4913d84bcb0fdf0b 100644 +index dd08e74a2741c89e00fe1487f90834dfbbd92ce2..34c635da9ff7aee5105f9a6d7661eb13df0b98a3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -261,6 +261,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0236-Fix-NBT-type-issues.patch b/patches/server/0235-Fix-NBT-type-issues.patch similarity index 100% rename from patches/server/0236-Fix-NBT-type-issues.patch rename to patches/server/0235-Fix-NBT-type-issues.patch diff --git a/patches/server/0237-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0236-Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/server/0237-Remove-unnecessary-itemmeta-handling.patch rename to patches/server/0236-Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 97% rename from patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 5d888284af..84da150642 100644 --- a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -8,7 +8,7 @@ Add -Ddebug.entities=true to your JVM flags to gain more information 1.17: Needs to be reworked for new entity storage system diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 3e1b2d2cedd44112a6c100ddfffe842d3be8b703..e76241660aaefa1736565515b98f7d33f86e10b3 100644 +index 61039a4b61317e293ea054a6a2c0e849e5a302f0..7b8a5efc73a7a0bfb51af7299341b0e2e988d4c1 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -896,6 +896,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -72,7 +72,7 @@ index 8b28de5755ad4fe50903837700feed32e4530afd..2daa8e2e64829df838bde981a56d6e40 return false; } else { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ac6bd21798192c4c07737a2320c3626caebc7e22..b8257959acd2b38243fd259f367564080aff951e 100644 +index 0ae266bea5be068ece32a5a2f9b677117680e67b..5116be3075c1249254524bf6a5b6bc28c61400e6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -235,6 +235,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 98% rename from patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch index 5f69ea0c9a..49cb6e507a 100644 --- a/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch @@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash. This will help diagnose what was going on in that time before the crash. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2b55df58684a19519335666858bc79de8067faf7..6026a2da9645a5f22aa18c74e35d8b76a3f29352 100644 +index bb7da8b167b72f2b1fec2be8838545ae4ed71eb3..eef3b01d1304e06d0c9971df82af54d90676957a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1051,6 +1051,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 05e72945da26295fbc5f0d243ba48a8649244b3b..572dc30729a4511dcc7002434017edf8b0ce5a89 100644 +index 117d4d39bd8ad01207f7056f1d82681568de5b38..202be4c0a143a14f99890426c8525484a7e0d6fd 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1908,15 +1908,59 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0271-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 94% rename from patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/server/0271-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch index 6b8c4ac1f9..ae8f72f216 100644 --- a/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch +++ b/patches/server/0271-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch @@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check other worlds. diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index 11cfe63c101f5d76d3481a3163dbaec22685ccce..b0caf14a196cd8c3a02d8e931a08857173ffb4da 100644 +index ec5fc3293097b364b5f6d8acc756aa8adde15215..a904507707475e95b6389ccc437bd234b97c10cc 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java @@ -58,6 +58,18 @@ public abstract class Projectile extends Entity { diff --git a/patches/server/0273-Add-more-Witch-API.patch b/patches/server/0272-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0273-Add-more-Witch-API.patch rename to patches/server/0272-Add-more-Witch-API.patch diff --git a/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0273-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/server/0273-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0274-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 98% rename from patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/server/0274-Add-option-to-prevent-players-from-moving-into-unloa.patch index 595d71acf8..45f1c1f4a3 100644 --- a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/patches/server/0274-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c5ad4d8a08f03a6f75241f4e4913d84bcb0fdf0b..9843684ab5cf21bfc4fe30f3528dc75475b4dcd1 100644 +index 34c635da9ff7aee5105f9a6d7661eb13df0b98a3..a0c18ab3411272229d9c3ce2a8faf4812f8cf60f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -563,9 +563,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0276-Reset-players-airTicks-on-respawn.patch b/patches/server/0275-Reset-players-airTicks-on-respawn.patch similarity index 89% rename from patches/server/0276-Reset-players-airTicks-on-respawn.patch rename to patches/server/0275-Reset-players-airTicks-on-respawn.patch index 34f1b4bbfb..21f3bd2920 100644 --- a/patches/server/0276-Reset-players-airTicks-on-respawn.patch +++ b/patches/server/0275-Reset-players-airTicks-on-respawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 572dc30729a4511dcc7002434017edf8b0ce5a89..15d4ad53cca71272e491bea31d83e8c8e697dac0 100644 +index 202be4c0a143a14f99890426c8525484a7e0d6fd..3f9f7faeaa33a4f5d55812d6964496c0b9c8abb4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2337,6 +2337,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0276-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/server/0276-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0277-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 98% rename from patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/server/0277-Improve-Server-Thread-Pool-and-Thread-Priorities.patch index eea41e9ee0..2b1e9c0b9a 100644 --- a/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch +++ b/patches/server/0277-Improve-Server-Thread-Pool-and-Thread-Priorities.patch @@ -81,7 +81,7 @@ index c085ed233eb4d1f2100ec23a77447ef799ecdf1f..8120739e2a7c4c86ecb7058f08bd8179 return executorService; } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6026a2da9645a5f22aa18c74e35d8b76a3f29352..45f3035be38571088edf293070b8d84b19a4101a 100644 +index eef3b01d1304e06d0c9971df82af54d90676957a..2459fc1699582410b1fca4d787c6115563a575ba 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -317,6 +317,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return worldserver + " " + worldserver.dimension().location(); diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 9a3cc9af85b1f1d4d9ecb093f874f03d9bfde342..da74c2f131f74b830c616baed5b932466a009e91 100644 +index 00c438de76577e7b869270df16915d1ade088c9f..79023dace09c99587b5100de29b5b0ed3ba3fc57 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -634,11 +634,12 @@ public final class ItemStack { diff --git a/patches/server/0333-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0332-PlayerDeathEvent-shouldDropExperience.patch similarity index 91% rename from patches/server/0333-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0332-PlayerDeathEvent-shouldDropExperience.patch index e77ab4925b..0bc11f1314 100644 --- a/patches/server/0333-PlayerDeathEvent-shouldDropExperience.patch +++ b/patches/server/0332-PlayerDeathEvent-shouldDropExperience.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 5eafbf1fd9b0f54819c9b2d99803c07a1708ce02..ecb81ad7ab281eaad7d5b3f9dc30082595824408 100644 +index b8fba7ed700b53ef14747fa61c1c367ec98a6328..9265ef8bc10f29410b78ea2555107800c5566cbf 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -918,7 +918,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0334-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0333-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0334-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0333-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0335-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0335-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0337-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch similarity index 94% rename from patches/server/0337-Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch index 8105dcf3fc..80e187d970 100644 --- a/patches/server/0337-Optimise-EntityGetter-getPlayerByUUID.patch +++ b/patches/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise EntityGetter#getPlayerByUUID Use the PlayerList map instead of iterating over all players diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0635f84d062872a9a6e38a9ba3fe71026661e651..79f09d83e10e3d357cfe1537ab7cdde8b494d9d2 100644 +index b287df21d9671963257f04e9ee75a1468bbc12e0..f85cbcd0ba398bdd2622a2e1aaba7de24d53038a 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -426,6 +426,15 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0338-Fix-items-not-falling-correctly.patch b/patches/server/0337-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0338-Fix-items-not-falling-correctly.patch rename to patches/server/0337-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0339-Lag-compensate-eating.patch b/patches/server/0338-Lag-compensate-eating.patch similarity index 97% rename from patches/server/0339-Lag-compensate-eating.patch rename to patches/server/0338-Lag-compensate-eating.patch index 5226762366..0e2c67e8b1 100644 --- a/patches/server/0339-Lag-compensate-eating.patch +++ b/patches/server/0338-Lag-compensate-eating.patch @@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating. Change to also use a time check instead if it passes. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 399c34b2837f2b54b452c866c524c51ba813fcc0..840fb46729b940b6d4d7adb4d0545b5a8508e11b 100644 +index ba4e0bac019b68da166b277028015999139d2981..b448a7b6318311ce3542e49a2f1670ccac77c215 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3592,6 +3592,11 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0340-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0339-Optimize-call-to-getFluid-for-explosions.patch similarity index 91% rename from patches/server/0340-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0339-Optimize-call-to-getFluid-for-explosions.patch index 0d341fc2ce..85405d5c01 100644 --- a/patches/server/0340-Optimize-call-to-getFluid-for-explosions.patch +++ b/patches/server/0339-Optimize-call-to-getFluid-for-explosions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize call to getFluid for explosions diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 9f7a35e00b5edca6b2d99d3ed60cde8e1aeac4eb..2dc93845749951cd51a19fd9ee515cebcba5d731 100644 +index c4f1b98de5b7db95ca886c0f8b7b893428e1b460..cc8dcb77f2b6d447c0e8d769a3d233dc2eb64efa 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -168,7 +168,7 @@ public class Explosion { diff --git a/patches/server/0341-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0341-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/server/0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0342-Entity-Activation-Range-2.0.patch b/patches/server/0341-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0342-Entity-Activation-Range-2.0.patch rename to patches/server/0341-Entity-Activation-Range-2.0.patch diff --git a/patches/server/0343-Increase-Light-Queue-Size.patch b/patches/server/0342-Increase-Light-Queue-Size.patch similarity index 100% rename from patches/server/0343-Increase-Light-Queue-Size.patch rename to patches/server/0342-Increase-Light-Queue-Size.patch diff --git a/patches/server/0344-Anti-Xray.patch b/patches/server/0343-Anti-Xray.patch similarity index 99% rename from patches/server/0344-Anti-Xray.patch rename to patches/server/0343-Anti-Xray.patch index eb92ff131b..d46f4de247 100644 --- a/patches/server/0344-Anti-Xray.patch +++ b/patches/server/0343-Anti-Xray.patch @@ -1558,7 +1558,7 @@ index b8f5ad1130b125f71a1feb1083120fb700b9bea1..f6d1eac46c619831e146c62a9c08d330 // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 6772b7e6ebded67f656dfb1af99e4d516aca67c5..1ac0778fba70ba9f09487c76e086b5a873c6c12a 100644 +index 832c6d92daaa96210a9c7edbd357ca824a60a4a5..0fadc763fb482cf9f3b51ed44427029bec9f7f63 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -55,7 +55,7 @@ public class CraftChunk implements Chunk { @@ -1584,7 +1584,7 @@ index 7bc16e221b37629708299773519da60a1d9930ac..3106711ef8034077cd54e40dc2e8fa00 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0c1c0fdfc6b1ab305b560d272efde4565922eac5..caacf6dbe6c4fd461624ea421d08a18222fc2a6e 100644 +index dd12b13bc8e8f0a7791f6204c25461758d6d0d07..2d21aeceea5a91930fb80ae838d04e5accc63391 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -409,11 +409,16 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0345-Implement-alternative-item-despawn-rate.patch b/patches/server/0344-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0345-Implement-alternative-item-despawn-rate.patch rename to patches/server/0344-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0346-Tracking-Range-Improvements.patch b/patches/server/0345-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0346-Tracking-Range-Improvements.patch rename to patches/server/0345-Tracking-Range-Improvements.patch diff --git a/patches/server/0347-Fix-items-vanishing-through-end-portal.patch b/patches/server/0346-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/0347-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0346-Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/0348-implement-optional-per-player-mob-spawns.patch b/patches/server/0347-implement-optional-per-player-mob-spawns.patch similarity index 99% rename from patches/server/0348-implement-optional-per-player-mob-spawns.patch rename to patches/server/0347-implement-optional-per-player-mob-spawns.patch index 257f0c8a51..116511d3b1 100644 --- a/patches/server/0348-implement-optional-per-player-mob-spawns.patch +++ b/patches/server/0347-implement-optional-per-player-mob-spawns.patch @@ -362,7 +362,7 @@ index c021733342c09adb04ce3f675209543f84ac4bda..d137aa95f670aab516e9e08272f33b21 this.lastSpawnState = spawnercreature_d; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 20861571e8026c3c4fa40b7f8f14a2df0ebcc208..5da6530580c1d0ce298498782e8e7eb8bbf3cb3c 100644 +index 9265ef8bc10f29410b78ea2555107800c5566cbf..4a25bd069bdfc6bd35e05cc86a392edad902ab11 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -240,6 +240,11 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0349-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0349-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0350-Improve-Block-breakNaturally-API.patch b/patches/server/0349-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/0350-Improve-Block-breakNaturally-API.patch rename to patches/server/0349-Improve-Block-breakNaturally-API.patch diff --git a/patches/server/0351-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0351-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0352-Add-debug-for-sync-chunk-loads.patch b/patches/server/0351-Add-debug-for-sync-chunk-loads.patch similarity index 99% rename from patches/server/0352-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0351-Add-debug-for-sync-chunk-loads.patch index 039de5d5a0..e1e2010e32 100644 --- a/patches/server/0352-Add-debug-for-sync-chunk-loads.patch +++ b/patches/server/0351-Add-debug-for-sync-chunk-loads.patch @@ -320,7 +320,7 @@ index f838a921a08981bac0d0c0a68e334ba06d11cb18..665e088cb0b73f6a0c62f29c56da462b chunkproviderserver_b.managedBlock(completablefuture::isDone); io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - async chunk debug // Paper - rewrite chunk system diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index a94c43386b372cdff0b207bebbf8d5b29b5fd022..a2bba2678a56c5ea197e8b18c4a96e0833121fbe 100644 +index 76c388347ebbff2d50a975b40dbe93cc2760f6bb..52a514b657485246827bf9c153303b8b5229bf5b 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -424,6 +424,12 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0353-Remove-garbage-Java-version-check.patch b/patches/server/0352-Remove-garbage-Java-version-check.patch similarity index 91% rename from patches/server/0353-Remove-garbage-Java-version-check.patch rename to patches/server/0352-Remove-garbage-Java-version-check.patch index 7c9466a2ac..56a2300cea 100644 --- a/patches/server/0353-Remove-garbage-Java-version-check.patch +++ b/patches/server/0352-Remove-garbage-Java-version-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove garbage Java version check diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index d4f6d7fee1012adaef516f283ef8d12b5804af46..0e59dd7c30159856a72be04c56a7031ace5dd738 100644 +index 127b05c44aa1e20ce097f1c1fe6b6ca2b32226c0..4f666a16a46d86cd0919bbe8f8b918a7f451d254 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -196,10 +196,6 @@ public class Main { diff --git a/patches/server/0354-Add-ThrownEggHatchEvent.patch b/patches/server/0353-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0354-Add-ThrownEggHatchEvent.patch rename to patches/server/0353-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0355-Entity-Jump-API.patch b/patches/server/0354-Entity-Jump-API.patch similarity index 100% rename from patches/server/0355-Entity-Jump-API.patch rename to patches/server/0354-Entity-Jump-API.patch diff --git a/patches/server/0356-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0355-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0356-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0355-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0357-Make-the-GUI-graph-fancier.patch b/patches/server/0356-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0357-Make-the-GUI-graph-fancier.patch rename to patches/server/0356-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0358-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0357-add-hand-to-BlockMultiPlaceEvent.patch similarity index 93% rename from patches/server/0358-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0357-add-hand-to-BlockMultiPlaceEvent.patch index 31af0eff86..82d0a1f49e 100644 --- a/patches/server/0358-add-hand-to-BlockMultiPlaceEvent.patch +++ b/patches/server/0357-add-hand-to-BlockMultiPlaceEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2d55260f4c753bfdd9f7fca69f1a9a1df0d28d1c..417ae46d36690f7f7c72fb85331f8d5ff21ab937 100644 +index 6e533fdcd0671892a0e9dbfc99662feb433a5cf8..24f1be1dcf2156fe17fec1c66529514b50925e2b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -349,13 +349,18 @@ public class CraftEventFactory { diff --git a/patches/server/0359-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0358-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0359-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0358-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0360-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0360-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0361-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0360-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0361-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0360-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0362-Optimise-Chunk-getFluid.patch b/patches/server/0361-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0362-Optimise-Chunk-getFluid.patch rename to patches/server/0361-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0363-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0362-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0363-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0362-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0364-Add-tick-times-API-and-mspt-command.patch b/patches/server/0363-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0364-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0363-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0365-Expose-MinecraftServer-isRunning.patch b/patches/server/0364-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0365-Expose-MinecraftServer-isRunning.patch rename to patches/server/0364-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0366-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0365-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0366-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0365-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0367-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 98% rename from patches/server/0367-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch index be7b6a44fd..a238fa8613 100644 --- a/patches/server/0367-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/patches/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per world and the world age for the start day. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 33fee57bcd3d82bed27f5e42e2e0f4b0299a1790..a43d7c3de254f47f1b460604d0b5c0d4fd6f5d6e 100644 +index 4a25bd069bdfc6bd35e05cc86a392edad902ab11..d8bdd5e66d8019ec2a318141eb135a2028682624 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -236,6 +236,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0368-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0368-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0369-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0369-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0370-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 96% rename from patches/server/0370-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch index 086c88c829..b1531fa1aa 100644 --- a/patches/server/0370-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch +++ b/patches/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch @@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding Stack will identify any causer of this and warn instead of crashing. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index a7a3e163cc93d71c843c75f93b78573fe8118613..fc561ba1a8df5fe87b69d7e2ff18ebca04933bfe 100644 +index fcdd8a8570d07e8bd3339275c7b6999be3f726b3..b2e95249ee5aa37d5e41679a7cb94e01c1b41494 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1030,6 +1030,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0371-Don-t-tick-dead-players.patch b/patches/server/0370-Don-t-tick-dead-players.patch similarity index 91% rename from patches/server/0371-Don-t-tick-dead-players.patch rename to patches/server/0370-Don-t-tick-dead-players.patch index f33f0cd629..208efe70c7 100644 --- a/patches/server/0371-Don-t-tick-dead-players.patch +++ b/patches/server/0370-Don-t-tick-dead-players.patch @@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else. This is safe because Spectators are skipped in unloaded chunks too in vanilla. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a43d7c3de254f47f1b460604d0b5c0d4fd6f5d6e..8bb61bf4f27ad9dac6d129dc7f8154eb2e608d82 100644 +index d8bdd5e66d8019ec2a318141eb135a2028682624..155dcb0f100d847e8d0ebd219747d3fb30dc9999 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -675,7 +675,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0372-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 90% rename from patches/server/0372-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch index 48076cac63..de159bd74a 100644 --- a/patches/server/0372-Dead-Player-s-shouldn-t-be-able-to-move.patch +++ b/patches/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch @@ -7,7 +7,7 @@ This fixes a lot of game state issues where packets were delayed for processing due to 1.15's new queue but processed while dead. diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index ba8b6d3fbc10eb9f02d3409eb2038827c47ca14d..3563f5d893fb650892ca7231767d505b7a17c8c0 100644 +index 6f3d06b929e9b5c22b3090683d5eb90bc3c98421..deb67acf5a60ea8a3cec866cd75ac036257ef0b5 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1154,7 +1154,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0373-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0372-Optimize-Collision-to-not-load-chunks.patch similarity index 97% rename from patches/server/0373-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0372-Optimize-Collision-to-not-load-chunks.patch index b3c9eb774d..3f2d84aa56 100644 --- a/patches/server/0373-Optimize-Collision-to-not-load-chunks.patch +++ b/patches/server/0372-Optimize-Collision-to-not-load-chunks.patch @@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading massive amounts of surrounding chunks due to large AABB lookups. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 4b1a900ce1531526b91b01217f291bc10526956b..a5e485742b10419a031b3cc48591a0bbbcab4fb5 100644 +index 614ee0c22fcb2f909c53e2deff03f6343b2ad803..3b7db01c51868c8a820b87cd13f69cd2bbce3e85 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -805,6 +805,7 @@ public abstract class PlayerList { @@ -26,7 +26,7 @@ index 4b1a900ce1531526b91b01217f291bc10526956b..a5e485742b10419a031b3cc48591a0bb entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ()); } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f0c7c31c2646c2b26a3f98e5b5c822712696d960..fada693b270d0954f6bbc5965fb3af82a8bd524e 100644 +index 6b19894c4353cf96d853d00128614b6d49c7a3c1..1e4699372b22c3fe3eed6859c3f15f9b70a537c0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -236,6 +236,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0374-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0373-Don-t-move-existing-players-to-world-spawn.patch similarity index 92% rename from patches/server/0374-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0373-Don-t-move-existing-players-to-world-spawn.patch index 2a6ce8dd99..8d68f0972e 100644 --- a/patches/server/0374-Don-t-move-existing-players-to-world-spawn.patch +++ b/patches/server/0373-Don-t-move-existing-players-to-world-spawn.patch @@ -13,7 +13,7 @@ By skipping this, we avoid potential for a large spike on server start. public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8bb61bf4f27ad9dac6d129dc7f8154eb2e608d82..300658b41ed77c5f9403c260b6cdc62f3a323a35 100644 +index 155dcb0f100d847e8d0ebd219747d3fb30dc9999..318bbc94726456049336aeba0a048c577eaa0614 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -328,7 +328,7 @@ public class ServerPlayer extends Player { @@ -35,7 +35,7 @@ index 8bb61bf4f27ad9dac6d129dc7f8154eb2e608d82..300658b41ed77c5f9403c260b6cdc62f this.gameMode.setLevel((ServerLevel) world); } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index a5e485742b10419a031b3cc48591a0bbbcab4fb5..ba0df02c2b3387b7e7698e59ce3021f1019b9a8a 100644 +index 3b7db01c51868c8a820b87cd13f69cd2bbce3e85..1051e81a0fb9f0a590e92b0d1fa27cb7afcae06f 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -222,6 +222,8 @@ public abstract class PlayerList { diff --git a/patches/server/0375-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0375-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0376-Improved-Watchdog-Support.patch b/patches/server/0375-Improved-Watchdog-Support.patch similarity index 98% rename from patches/server/0376-Improved-Watchdog-Support.patch rename to patches/server/0375-Improved-Watchdog-Support.patch index 18a36f5752..aeab4e8bc7 100644 --- a/patches/server/0376-Improved-Watchdog-Support.patch +++ b/patches/server/0375-Improved-Watchdog-Support.patch @@ -41,7 +41,7 @@ This also moves all plugins who register "delayed init" tasks to occur just befo are properly accounted for and wont trip watchdog on init. diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 5a19e30a9b7e65a70f68a429b8ca741f788a303b..7b1843e16745ca8db2244e17490d291401f22679 100644 +index 6aaed8e8bf8c721fc834da5c76ac72a4c3e92458..4b002e8b75d117b726b0de274a76d3596fce015b 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -92,7 +92,12 @@ public class Metrics { @@ -71,7 +71,7 @@ index 336795dff742b7c6957fbd3476aff31d25a5e659..30a58229aa6dac5039511d0c0df5f291 cause = cause.getCause(); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8ea5d3cb180b403f68d95ad6428dcad91b88ba2c..e09ed2ebd1c2a837978c804ced0fe6e79018b588 100644 +index 8dcbeeae50afe23aa7e2a083239f0a315424574f..d406df9626d29ee257b8eedcbea2af09ed4b6baf 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -295,7 +295,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 37b1354edb2974e82eaa5c859f58c588df70c575..c5a11e22c44d5adb55844bde964ca43acbc03fdf 100644 +index 9621438358c85cf66c756f0d53bcd89f4f0ec933..ba11b19658cc1112de7c784637d053b68177b269 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3364,10 +3364,24 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0382-Implement-Player-Client-Options-API.patch b/patches/server/0381-Implement-Player-Client-Options-API.patch similarity index 97% rename from patches/server/0382-Implement-Player-Client-Options-API.patch rename to patches/server/0381-Implement-Player-Client-Options-API.patch index 707a2c77e3..6920828cfe 100644 --- a/patches/server/0382-Implement-Player-Client-Options-API.patch +++ b/patches/server/0381-Implement-Player-Client-Options-API.patch @@ -87,7 +87,7 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 21b5f0742f16409ace4fabf44f04d5964d486aeb..9ec157712b9c891067507f9a308428cee2895fed 100644 +index af55a0cc48e505ac55445ef8cc6495c68d0757c8..4a4f829e9cf984a6f129548cdf1316823ce146cb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1885,9 +1885,24 @@ public class ServerPlayer extends Player { @@ -116,7 +116,7 @@ index 21b5f0742f16409ace4fabf44f04d5964d486aeb..9ec157712b9c891067507f9a308428ce if (getMainArm() != packet.mainHand()) { PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b9e484ec8173be94fae307830e87a9205e56a11e..d9e278d2f7f4bc767c0211736817748d4ca6dae0 100644 +index 727ed31aefa4e0893a03afd4b90b01ad6ed51ce4..4592cac06c8e96d4677ba315f70d5336fcdd0558 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -617,6 +617,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0383-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0383-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0384-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 95% rename from patches/server/0384-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index 79caa4f853..52f67578d2 100644 --- a/patches/server/0384-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/patches/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -31,7 +31,7 @@ delays anymore. public net.minecraft.server.level.ChunkMap addEntity(Lnet/minecraft/world/entity/Entity;)V diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index e8a52daa2ff7782fa39862e97580234058b8766e..6b01d5b5535887eef0ac7b8a5e0a669a2700e83f 100644 +index b2e95249ee5aa37d5e41679a7cb94e01c1b41494..11a4ba46869e3073375d85820426f0662bd2caf7 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1036,6 +1036,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -43,7 +43,7 @@ index e8a52daa2ff7782fa39862e97580234058b8766e..6b01d5b5535887eef0ac7b8a5e0a669a if (!(entity instanceof EnderDragonPart)) { EntityType entitytypes = entity.getType(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9ec157712b9c891067507f9a308428cee2895fed..ecaf03a72caac6e7866094bae7256f5447a962e4 100644 +index 4a4f829e9cf984a6f129548cdf1316823ce146cb..33b6f23f483535714fc020da47c79fca33271c62 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -259,6 +259,7 @@ public class ServerPlayer extends Player { @@ -55,7 +55,7 @@ index 9ec157712b9c891067507f9a308428cee2895fed..ecaf03a72caac6e7866094bae7256f54 public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 6c5c00e2fb29b5bdd73540badd159778eb1c1ff6..cfc497822e4e1dfc21807ec93bcfabb215cdbb95 100644 +index 3cc7ef57fa5bf43ae5de25b69e2b73e56c4bb703..c2e7192e6b35900c400e4541425baf6cdaf94b83 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -291,6 +291,12 @@ public abstract class PlayerList { diff --git a/patches/server/0385-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0385-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 95% rename from patches/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch index bcaa5ef25b..8e233aa04a 100644 --- a/patches/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/patches/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a49717ebf2b2d961b7f57dade57105bc9f16639c..e118a4a41c4c11c53b5a1783113f096bdb4a9f2d 100644 +index ba11b19658cc1112de7c784637d053b68177b269..8371e37705c871f3b4bef0ffcf0a0bbb50a1c783 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2128,7 +2128,16 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0387-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0386-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0387-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0386-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0388-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0387-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0388-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0387-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 99% rename from patches/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch index 41704f2b8a..fe7ad6c372 100644 --- a/patches/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/patches/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -80,7 +80,7 @@ index 7e8d434944596b4d82675448ddff4046a1b0b4b4..462159a70eb92f463b25ef840656a8f8 public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e118a4a41c4c11c53b5a1783113f096bdb4a9f2d..f0c37129240fadac40fec607afda1ccef446caa0 100644 +index 8371e37705c871f3b4bef0ffcf0a0bbb50a1c783..b26b598678ea474b3abc67acebdbed9b278e89bc 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1647,9 +1647,9 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0390-Villager-Restocks-API.patch b/patches/server/0389-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0390-Villager-Restocks-API.patch rename to patches/server/0389-Villager-Restocks-API.patch diff --git a/patches/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 95% rename from patches/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch index 11fa856076..9d8cd57f8a 100644 --- a/patches/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/patches/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b42ef07a2653b62cf6ba44172e5a919be3de964f..792fdd57c0d31e5de4f5819d40677a53a84773d1 100644 +index 65a928907c7a5df39d2596286860c6798c13910a..069d5ee0aa0921240d85fa0fc12e9e355dbf21e9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -955,7 +955,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0392-Expose-game-version.patch b/patches/server/0391-Expose-game-version.patch similarity index 100% rename from patches/server/0392-Expose-game-version.patch rename to patches/server/0391-Expose-game-version.patch diff --git a/patches/server/0393-Optimize-Voxel-Shape-Merging.patch b/patches/server/0392-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0393-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0392-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 93% rename from patches/server/0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index bcdd9a4e15..dd28cd0b5d 100644 --- a/patches/server/0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/patches/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch @@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache. Set system properly at server startup if not set already to help protect from this. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 2451084f0d0bad43b7cf5c89f5590098f89b32a5..1176f77c79c2cbd727f1f6867e956fb698936349 100644 +index f7c8d25830ed701e72f828fa73066a6e9188253b..4714e0199987d864b37aaec94ffa885a5b76b437 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -28,6 +28,7 @@ public class Main { diff --git a/patches/server/0395-misc-debugging-dumps.patch b/patches/server/0394-misc-debugging-dumps.patch similarity index 98% rename from patches/server/0395-misc-debugging-dumps.patch rename to patches/server/0394-misc-debugging-dumps.patch index e40916f2df..a4b7af3683 100644 --- a/patches/server/0395-misc-debugging-dumps.patch +++ b/patches/server/0394-misc-debugging-dumps.patch @@ -58,7 +58,7 @@ index d406df9626d29ee257b8eedcbea2af09ed4b6baf..366959f9841eb0ef3669b3b3b069d767 this.running = false; if (waitForShutdown) { diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 203786383387765d1f5a2d2ccce79d792fd5b187..8044885a91b316b2e5e92dd6260b8e515dcea5a9 100644 +index 9d3ea20adba300a38a544c3454eff2edd9b4bbb9..3e6ec2cef2b5b058f240dd471d5c7a22d362e067 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -183,6 +183,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0396-Prevent-teleporting-dead-entities.patch b/patches/server/0395-Prevent-teleporting-dead-entities.patch similarity index 92% rename from patches/server/0396-Prevent-teleporting-dead-entities.patch rename to patches/server/0395-Prevent-teleporting-dead-entities.patch index 8eea504603..ea72094b65 100644 --- a/patches/server/0396-Prevent-teleporting-dead-entities.patch +++ b/patches/server/0395-Prevent-teleporting-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 792fdd57c0d31e5de4f5819d40677a53a84773d1..c5d1fc2e7c8090ed91cb6ca24135c5aaa2172fa9 100644 +index 069d5ee0aa0921240d85fa0fc12e9e355dbf21e9..d95b9f70a365e7bfa9b36738dd56dcad891b0525 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1621,6 +1621,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 99% rename from patches/server/0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index f0e3104e62..b558e2be95 100644 --- a/patches/server/0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and diff --git a/build.gradle.kts b/build.gradle.kts -index a4b47b69e14643cd82d71d18941144ecbf50db8b..ce7a583355a6f4ce98c571fa7b60d9034f51bd3c 100644 +index 718d80ca0c808d072a57933775fa53423f781aa1..09d8a2e7e63dfeb6a893ae44b43bdeb9ec9804ea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,12 +19,14 @@ dependencies { @@ -556,7 +556,7 @@ index a24ef433d0c9d06b86fd612978cfd6d877036791..1b38326c9a709536dc4cccf9af93aede final MinecraftServer server; public volatile boolean running; diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 8044885a91b316b2e5e92dd6260b8e515dcea5a9..75a32d33518023cb24ba639751631bfad3563bd5 100644 +index 3e6ec2cef2b5b058f240dd471d5c7a22d362e067..b09069196fbcba32bdd6ea67718ea4c3086fb318 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -185,7 +185,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0398-Implement-Mob-Goal-API.patch b/patches/server/0397-Implement-Mob-Goal-API.patch similarity index 99% rename from patches/server/0398-Implement-Mob-Goal-API.patch rename to patches/server/0397-Implement-Mob-Goal-API.patch index a42997ed42..6d74fed31a 100644 --- a/patches/server/0398-Implement-Mob-Goal-API.patch +++ b/patches/server/0397-Implement-Mob-Goal-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API diff --git a/build.gradle.kts b/build.gradle.kts -index ce7a583355a6f4ce98c571fa7b60d9034f51bd3c..8f32e0c3078366f4b07a499b1838929564a05b76 100644 +index 09d8a2e7e63dfeb6a893ae44b43bdeb9ec9804ea..dea5594330830b4a7a2a717188cc33367c38a5ad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,6 +35,7 @@ dependencies { diff --git a/patches/server/0399-Add-villager-reputation-API.patch b/patches/server/0398-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0399-Add-villager-reputation-API.patch rename to patches/server/0398-Add-villager-reputation-API.patch diff --git a/patches/server/0400-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 96% rename from patches/server/0400-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch index 6e847de4a8..bebb912713 100644 --- a/patches/server/0400-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/patches/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option for maximum exp value when merging orbs diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 7069b447c12c170683dee7052327a55c29af83c4..a8d9ad5eba330c23d2cc745242977f4fb1b4c674 100644 +index cd6e0904dbdac5d7e1630e59d6ffa2ba0a5b3b2f..4db162f13a0a9b4afacbdb30326e6d18529d5382 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -631,16 +631,30 @@ public class CraftEventFactory { diff --git a/patches/server/0401-ExperienceOrbMergeEvent.patch b/patches/server/0400-ExperienceOrbMergeEvent.patch similarity index 94% rename from patches/server/0401-ExperienceOrbMergeEvent.patch rename to patches/server/0400-ExperienceOrbMergeEvent.patch index e71bdda1e5..46ab102e0f 100644 --- a/patches/server/0401-ExperienceOrbMergeEvent.patch +++ b/patches/server/0400-ExperienceOrbMergeEvent.patch @@ -9,7 +9,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index a8d9ad5eba330c23d2cc745242977f4fb1b4c674..4610d7d329c9c8bf3cbe8c203fe8c89413717df2 100644 +index 4db162f13a0a9b4afacbdb30326e6d18529d5382..4a260923efd062ccd72bf9c0c93255c9af73ab47 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -641,7 +641,7 @@ public class CraftEventFactory { diff --git a/patches/server/0402-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0401-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0402-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0401-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0403-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0402-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0403-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0402-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0404-Potential-bed-API.patch b/patches/server/0403-Potential-bed-API.patch similarity index 95% rename from patches/server/0404-Potential-bed-API.patch rename to patches/server/0403-Potential-bed-API.patch index 633d9baf8a..9725646220 100644 --- a/patches/server/0404-Potential-bed-API.patch +++ b/patches/server/0403-Potential-bed-API.patch @@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index f5f30e1408892b4e728053bc5005e551396583a5..15f6e1c04fefa1334301534646b8ed2535d16fa9 100644 +index b3307db9a0707dd0883d04637eb553995190ca1c..728fc30046de534748e2379e8cb371cc2e51f9d3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag; diff --git a/patches/server/0405-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0404-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0405-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0404-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0406-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0406-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0407-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0407-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0408-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0407-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from patches/server/0408-Reduce-MutableInt-allocations-from-light-engine.patch rename to patches/server/0407-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/patches/server/0409-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0409-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0410-Ensure-safe-gateway-teleport.patch b/patches/server/0409-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0410-Ensure-safe-gateway-teleport.patch rename to patches/server/0409-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0411-Add-option-for-console-having-all-permissions.patch b/patches/server/0410-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0411-Add-option-for-console-having-all-permissions.patch rename to patches/server/0410-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 99% rename from patches/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch index 6bf9ef4965..6f37414684 100644 --- a/patches/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch +++ b/patches/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch @@ -333,7 +333,7 @@ index 665e088cb0b73f6a0c62f29c56da462bab7c927e..298e4468f7b5346733257f7117f76c66 } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 78913368d8fa74273126a1245d2faf55242fccdd..3fecc0c587de51c683a362a1a44fe3d5eed60979 100644 +index 33b6f23f483535714fc020da47c79fca33271c62..35d28066295bfbdac3f35b0565ea658bd20de892 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -264,6 +264,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0412-Use-distance-map-to-optimise-entity-tracker.patch similarity index 99% rename from patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/0412-Use-distance-map-to-optimise-entity-tracker.patch index bcc36d1ae5..6a4c3270a5 100644 --- a/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch +++ b/patches/server/0412-Use-distance-map-to-optimise-entity-tracker.patch @@ -287,7 +287,7 @@ index e87ade8697a33b9ea23dce59838a9ccd02ab09f6..81870f23ae70db3a1290428df6a47d76 return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false; } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 19218e993052d44a830f825f9a0eb695635861c1..2609bdb3f051e449f9a2e760e9c4d38f85855cf6 100644 +index 462159a70eb92f463b25ef840656a8f8594d8b9d..016cfb63f686352db750065938894df9bc0ee233 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -57,6 +57,7 @@ import net.minecraft.network.syncher.EntityDataSerializers; diff --git a/patches/server/0414-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0413-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0414-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0413-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0415-Maps-shouldn-t-load-chunks.patch b/patches/server/0414-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0415-Maps-shouldn-t-load-chunks.patch rename to patches/server/0414-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0416-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0416-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0417-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0417-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0418-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0417-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0418-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0417-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0419-Fix-sand-duping.patch b/patches/server/0418-Fix-sand-duping.patch similarity index 94% rename from patches/server/0419-Fix-sand-duping.patch rename to patches/server/0418-Fix-sand-duping.patch index 8f832a7d15..f9661aee55 100644 --- a/patches/server/0419-Fix-sand-duping.patch +++ b/patches/server/0418-Fix-sand-duping.patch @@ -7,7 +7,7 @@ If the falling block dies during teleportation (entity#move), then we need to detect that by placing a check after the move. diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java -index e7404619877099aa2223da349e15090d2c9be1d0..23bd2a9af71b63bf463c7091ac261b033e9ce9af 100644 +index 97b2d12713d2245f1621d3ade5b5655b5897cbf4..06f6fe4d1be4b14c45d2576561201c9386988dc1 100644 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java @@ -128,6 +128,11 @@ public class FallingBlockEntity extends Entity { diff --git a/patches/server/0420-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0419-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0420-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0419-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 94% rename from patches/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch index e424ed2736..e0e651415c 100644 --- a/patches/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch +++ b/patches/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch @@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside of the move call and into an appropriate place in the tick method. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c5d1fc2e7c8090ed91cb6ca24135c5aaa2172fa9..fd3e8c2d3a415a6a3370784ec3c0d46d3c1122b7 100644 +index d95b9f70a365e7bfa9b36738dd56dcad891b0525..700dcbfb114b147c22a44b9960728c9f68db0a70 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1434,6 +1434,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0422-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0421-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0422-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0421-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0423-Improve-Arrow-API.patch b/patches/server/0422-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0423-Improve-Arrow-API.patch rename to patches/server/0422-Improve-Arrow-API.patch diff --git a/patches/server/0424-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0423-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0424-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0423-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0425-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0424-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0425-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0424-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0426-Add-permission-for-command-blocks.patch b/patches/server/0425-Add-permission-for-command-blocks.patch similarity index 98% rename from patches/server/0426-Add-permission-for-command-blocks.patch rename to patches/server/0425-Add-permission-for-command-blocks.patch index 0b1fec8754..ac7eaab661 100644 --- a/patches/server/0426-Add-permission-for-command-blocks.patch +++ b/patches/server/0425-Add-permission-for-command-blocks.patch @@ -18,7 +18,7 @@ index aee5144bdc5bd9f7b07ce3b72331bcfd42663ec9..a98254e38076e82f94db7b2f2112500e return false; } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8d8a42003ac6de567db8c2e052d43d698879b535..30bb23dc4d190c00ced761ed3c8ab1e2620d3a0a 100644 +index fab792e1c8285248c23f5ffed1e0dbe80671608d..fa06f9be742103e65aa90dfb9d21a93c119bf0c0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -866,7 +866,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0427-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0426-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0427-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0426-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 98% rename from patches/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index 1b356c7ff5..7ef82bf1aa 100644 --- a/patches/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -76,7 +76,7 @@ index 771677c0e1cd7bfe089b9a5bb9095650216ff588..520cd1a6b347687b2ec6d13f034be391 @Override diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3fecc0c587de51c683a362a1a44fe3d5eed60979..ca08f04aed8296437eafee93093f96c03c1d418f 100644 +index 35d28066295bfbdac3f35b0565ea658bd20de892..fcd3f4259989a004fcfc5270b2b95c81454ed01b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1149,7 +1149,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0429-Paper-dumpitem-command.patch b/patches/server/0428-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0429-Paper-dumpitem-command.patch rename to patches/server/0428-Paper-dumpitem-command.patch diff --git a/patches/server/0430-Improve-Legacy-Component-serialization-size.patch b/patches/server/0429-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0430-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0429-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0431-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0430-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0431-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0430-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0433-incremental-chunk-and-player-saving.patch b/patches/server/0432-incremental-chunk-and-player-saving.patch similarity index 97% rename from patches/server/0433-incremental-chunk-and-player-saving.patch rename to patches/server/0432-incremental-chunk-and-player-saving.patch index 3b5d3070b2..5d17e6192b 100644 --- a/patches/server/0433-incremental-chunk-and-player-saving.patch +++ b/patches/server/0432-incremental-chunk-and-player-saving.patch @@ -115,7 +115,7 @@ index 44ca46e7dff19ae99ff6cf0d82269c5f7ad7274a..95c53189e32aec6aca254fa3b157df7b // Paper start - rewrite chunk system - add close param this.save(progressListener, flush, savingDisabled, false); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ca08f04aed8296437eafee93093f96c03c1d418f..bb939f3312eb5a5740b445cfd268f1902955d4e8 100644 +index fcd3f4259989a004fcfc5270b2b95c81454ed01b..e6b175a62f2b151068fc7b28685b64afea1ebbc3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -181,6 +181,7 @@ import org.bukkit.inventory.MainHand; @@ -127,7 +127,7 @@ index ca08f04aed8296437eafee93093f96c03c1d418f..bb939f3312eb5a5740b445cfd268f190 private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10; public ServerGamePacketListenerImpl connection; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index cfc497822e4e1dfc21807ec93bcfabb215cdbb95..c6b76049c70bf42c216d833b6dc33254c24b2253 100644 +index c2e7192e6b35900c400e4541425baf6cdaf94b83..e1a92fb2bbc7258b714268298e1214fd5d6fe904 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -514,6 +514,7 @@ public abstract class PlayerList { diff --git a/patches/server/0434-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0433-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/0434-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/server/0433-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/0435-Support-old-UUID-format-for-NBT.patch b/patches/server/0434-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0435-Support-old-UUID-format-for-NBT.patch rename to patches/server/0434-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0436-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0435-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0436-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/server/0435-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0437-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0436-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0437-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0436-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0438-Remove-some-streams-from-structures.patch b/patches/server/0437-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0438-Remove-some-streams-from-structures.patch rename to patches/server/0437-Remove-some-streams-from-structures.patch diff --git a/patches/server/0439-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0438-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0439-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0438-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0440-Support-components-in-ItemMeta.patch b/patches/server/0439-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0440-Support-components-in-ItemMeta.patch rename to patches/server/0439-Support-components-in-ItemMeta.patch diff --git a/patches/server/0441-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0440-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0441-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0440-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0442-Add-entity-liquid-API.patch b/patches/server/0441-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0442-Add-entity-liquid-API.patch rename to patches/server/0441-Add-entity-liquid-API.patch diff --git a/patches/server/0443-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0442-Update-itemstack-legacy-name-and-lore.patch similarity index 97% rename from patches/server/0443-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0442-Update-itemstack-legacy-name-and-lore.patch index dc2f3d4011..5a47f65a58 100644 --- a/patches/server/0443-Update-itemstack-legacy-name-and-lore.patch +++ b/patches/server/0442-Update-itemstack-legacy-name-and-lore.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 29c605ff88956435752412847734992fe6bcd55d..36107f22914ec47212e41c17852fb486c67e5c52 100644 +index 79023dace09c99587b5100de29b5b0ed3ba3fc57..ae4c8eb5c06a877c24b22e3ce15b2751449102fd 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -170,6 +170,44 @@ public final class ItemStack { diff --git a/patches/server/0444-Spawn-player-in-correct-world-on-login.patch b/patches/server/0443-Spawn-player-in-correct-world-on-login.patch similarity index 94% rename from patches/server/0444-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0443-Spawn-player-in-correct-world-on-login.patch index a07a3e270c..3ed3c21c06 100644 --- a/patches/server/0444-Spawn-player-in-correct-world-on-login.patch +++ b/patches/server/0443-Spawn-player-in-correct-world-on-login.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c6b76049c70bf42c216d833b6dc33254c24b2253..b6bdbe4033b0252d61e8a0affd011475e700cb59 100644 +index e1a92fb2bbc7258b714268298e1214fd5d6fe904..290052c0c004047e26870365ca5eeb75eaff6371 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -201,7 +201,18 @@ public abstract class PlayerList { diff --git a/patches/server/0445-Add-PrepareResultEvent.patch b/patches/server/0444-Add-PrepareResultEvent.patch similarity index 99% rename from patches/server/0445-Add-PrepareResultEvent.patch rename to patches/server/0444-Add-PrepareResultEvent.patch index 7622a9c508..62ca3c6a39 100644 --- a/patches/server/0445-Add-PrepareResultEvent.patch +++ b/patches/server/0444-Add-PrepareResultEvent.patch @@ -94,7 +94,7 @@ index 78c1bd1c709ef29ccfa75fa87d8af1217cc57b59..4ee54e3a61588e5574e3f7ba06a73bbd private void setupRecipeList(Container input, ItemStack stack) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 985a5c5f01d54674f7bcb77e07f8890e81113418..856242121e5102dbc88080e8a611ae64348ba86e 100644 +index 4a260923efd062ccd72bf9c0c93255c9af73ab47..be1b4a27ccb4c7519ba9213267ab461304090b87 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1593,26 +1593,53 @@ public class CraftEventFactory { diff --git a/patches/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 90% rename from patches/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch index 5e3cb7002a..e9b0665218 100644 --- a/patches/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch +++ b/patches/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f0c37129240fadac40fec607afda1ccef446caa0..745797f1110db582cdac83c423b4cae78928ffe2 100644 +index b26b598678ea474b3abc67acebdbed9b278e89bc..2ce769b00798f35095f50380083c7cbf4de462ef 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3471,7 +3471,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0447-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0446-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0447-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0446-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0448-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0447-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0448-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/server/0447-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0449-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0448-Fix-arrows-never-despawning-MC-125757.patch similarity index 91% rename from patches/server/0449-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0448-Fix-arrows-never-despawning-MC-125757.patch index c04bb2c0b4..18bb8a0b53 100644 --- a/patches/server/0449-Fix-arrows-never-despawning-MC-125757.patch +++ b/patches/server/0448-Fix-arrows-never-despawning-MC-125757.patch @@ -9,7 +9,7 @@ instead of getting stuck in a never despawn state (bubble columns, etc). diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index f268fc2914996698490b84c4a30bac819c581d05..61d4a58ab25ce3bdf7ced426d2f92bc75ef02f7d 100644 +index 915c15faa510f4bdd3a96d8ba83280f08b12dec6..f427ad266a1e00adb661b9e4bc7cfe2a7ec52caa 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -200,6 +200,7 @@ public abstract class AbstractArrow extends Projectile { diff --git a/patches/server/0450-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0449-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0450-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0449-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0451-Fix-SPIGOT-5989.patch b/patches/server/0450-Fix-SPIGOT-5989.patch similarity index 97% rename from patches/server/0451-Fix-SPIGOT-5989.patch rename to patches/server/0450-Fix-SPIGOT-5989.patch index 0af182680c..12e8ee03d6 100644 --- a/patches/server/0451-Fix-SPIGOT-5989.patch +++ b/patches/server/0450-Fix-SPIGOT-5989.patch @@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is still at a respawn anchor. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b6bdbe4033b0252d61e8a0affd011475e700cb59..c618388599c5b56320c526e71613f8434a0e2c47 100644 +index 290052c0c004047e26870365ca5eeb75eaff6371..5d6128932e1af0445cf928fac6d6b91226a18de6 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -773,6 +773,7 @@ public abstract class PlayerList { diff --git a/patches/server/0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0451-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0451-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0452-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0452-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0453-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0453-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0455-Fix-some-rails-connecting-improperly.patch b/patches/server/0454-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0455-Fix-some-rails-connecting-improperly.patch rename to patches/server/0454-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0456-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0455-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0456-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0455-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0457-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0456-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0457-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0456-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0458-Brand-support.patch b/patches/server/0457-Brand-support.patch similarity index 100% rename from patches/server/0458-Brand-support.patch rename to patches/server/0457-Brand-support.patch diff --git a/patches/server/0459-Add-setMaxPlayers-API.patch b/patches/server/0458-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0459-Add-setMaxPlayers-API.patch rename to patches/server/0458-Add-setMaxPlayers-API.patch diff --git a/patches/server/0460-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0459-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0460-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0459-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0461-Don-t-require-FACING-data.patch b/patches/server/0460-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0461-Don-t-require-FACING-data.patch rename to patches/server/0460-Don-t-require-FACING-data.patch diff --git a/patches/server/0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0461-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 96% rename from patches/server/0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0461-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index 223fe0dca6..d2318fd46c 100644 --- a/patches/server/0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0461-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -17,7 +17,7 @@ index 95c53189e32aec6aca254fa3b157df7bc68d4d1a..0637fd424e98175f864f15c8bfa8bf69 // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 21051093bc65d30f32c6a5ea3ee07086e10d57c1..05599db0ed0da4d5055188722b9d15adfe4e4dec 100644 +index a25dbc2bd3005cb3d1aee61fb48522b13e7c4922..b3c28849841a0dd661ce81235914670ce6cbbfef 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -262,11 +262,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0463-Add-moon-phase-API.patch b/patches/server/0462-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0463-Add-moon-phase-API.patch rename to patches/server/0462-Add-moon-phase-API.patch diff --git a/patches/server/0464-Prevent-headless-pistons-from-being-created.patch b/patches/server/0463-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0464-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0463-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0465-Add-BellRingEvent.patch b/patches/server/0464-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0465-Add-BellRingEvent.patch rename to patches/server/0464-Add-BellRingEvent.patch diff --git a/patches/server/0466-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0465-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0466-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0465-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0467-Buffer-joins-to-world.patch b/patches/server/0466-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0467-Buffer-joins-to-world.patch rename to patches/server/0466-Buffer-joins-to-world.patch diff --git a/patches/server/0468-Eigencraft-redstone-implementation.patch b/patches/server/0467-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0468-Eigencraft-redstone-implementation.patch rename to patches/server/0467-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0469-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0468-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0469-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0468-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0470-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0469-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 98% rename from patches/server/0470-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0469-PortalCreateEvent-needs-to-know-its-entity.patch index acfc64af77..bbd4eb9d53 100644 --- a/patches/server/0470-PortalCreateEvent-needs-to-know-its-entity.patch +++ b/patches/server/0469-PortalCreateEvent-needs-to-know-its-entity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PortalCreateEvent needs to know its entity diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 9816d5767d808f6259b516602bc96078fd94793f..40395738e41575a5b2b1b4020c1c60707ceac9ad 100644 +index ae4c8eb5c06a877c24b22e3ce15b2751449102fd..d16fbd7817e71f50e35bc84eb889444e35eab415 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -440,7 +440,7 @@ public final class ItemStack { diff --git a/patches/server/0471-Fix-CraftTeam-null-check.patch b/patches/server/0470-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0471-Fix-CraftTeam-null-check.patch rename to patches/server/0470-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0472-Add-more-Evoker-API.patch b/patches/server/0471-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0472-Add-more-Evoker-API.patch rename to patches/server/0471-Add-more-Evoker-API.patch diff --git a/patches/server/0473-Add-methods-to-get-translation-keys.patch b/patches/server/0472-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0473-Add-methods-to-get-translation-keys.patch rename to patches/server/0472-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0474-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0473-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0474-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0473-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0475-Cache-block-data-strings.patch b/patches/server/0474-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0475-Cache-block-data-strings.patch rename to patches/server/0474-Cache-block-data-strings.patch diff --git a/patches/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0475-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 98% rename from patches/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0475-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index 9f51c53888..288d3d614e 100644 --- a/patches/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/server/0475-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -9,7 +9,7 @@ as this is how Vanilla teleports entities. Cancel any pending motion when teleported. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d06d1e00b42dd9474ec834e0bafa94329b90cb75..15b16d37928eca9f8da026df0c76a1f7cd43ba70 100644 +index 473944ad4f317dcb8d0a0ec9dcc736dfc04ae382..f365eaa38b9aa2331ab51374886021bc3c2f28c2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -748,7 +748,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0477-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0476-Add-additional-open-container-api-to-HumanEntity.patch similarity index 97% rename from patches/server/0477-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0476-Add-additional-open-container-api-to-HumanEntity.patch index 1c28c3f9cd..d4149ca464 100644 --- a/patches/server/0477-Add-additional-open-container-api-to-HumanEntity.patch +++ b/patches/server/0476-Add-additional-open-container-api-to-HumanEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add additional open container api to HumanEntity diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 15f6e1c04fefa1334301534646b8ed2535d16fa9..b8ba4e278de5c9a591789928c21bff26dcec2fb7 100644 +index 728fc30046de534748e2379e8cb371cc2e51f9d3..0117277db8402a1673c317673811c17d02edc4c9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -462,6 +462,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0478-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0477-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0478-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0477-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0479-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0478-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0479-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0478-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0480-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0479-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0480-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0479-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0481-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0480-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0481-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0480-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0482-Entity-isTicking.patch b/patches/server/0481-Entity-isTicking.patch similarity index 100% rename from patches/server/0482-Entity-isTicking.patch rename to patches/server/0481-Entity-isTicking.patch diff --git a/patches/server/0483-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0482-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0483-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0482-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0484-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0483-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0484-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0483-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0485-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0484-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0485-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0484-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0486-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0485-Fix-for-large-move-vectors-crashing-server.patch similarity index 98% rename from patches/server/0486-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0485-Fix-for-large-move-vectors-crashing-server.patch index ce95a77747..1ab85dbdea 100644 --- a/patches/server/0486-Fix-for-large-move-vectors-crashing-server.patch +++ b/patches/server/0485-Fix-for-large-move-vectors-crashing-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server Check movement distance also based on current position. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 15b16d37928eca9f8da026df0c76a1f7cd43ba70..ebce5372a4961b8518b3c5ee1f727705c8b68152 100644 +index f365eaa38b9aa2331ab51374886021bc3c2f28c2..aabfccdd94d5934716a706c9189391177ff07d57 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -563,9 +563,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0487-Optimise-getType-calls.patch b/patches/server/0486-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0487-Optimise-getType-calls.patch rename to patches/server/0486-Optimise-getType-calls.patch diff --git a/patches/server/0488-Villager-resetOffers.patch b/patches/server/0487-Villager-resetOffers.patch similarity index 100% rename from patches/server/0488-Villager-resetOffers.patch rename to patches/server/0487-Villager-resetOffers.patch diff --git a/patches/server/0489-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0488-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0489-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0488-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0490-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0489-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0490-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0489-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0491-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0490-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0491-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0490-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0492-Player-elytra-boost-API.patch b/patches/server/0491-Player-elytra-boost-API.patch similarity index 94% rename from patches/server/0492-Player-elytra-boost-API.patch rename to patches/server/0491-Player-elytra-boost-API.patch index 4ce8f6a2d3..d6f552f6a8 100644 --- a/patches/server/0492-Player-elytra-boost-API.patch +++ b/patches/server/0491-Player-elytra-boost-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e807cfbeecce04e87d30652a58e9eba372b9d8aa..d1d4b656ec2decef8ce4ab5344af75b59c62a0e7 100644 +index b098fcdcadcbf3dac5942a451a16e24b137fa08d..1360082426086a61a657c0cefc7bbc1a7df5f2ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -639,6 +639,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0493-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0492-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0493-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0492-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0494-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0493-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 97% rename from patches/server/0494-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0493-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch index fa266bb273..d2796ab1d2 100644 --- a/patches/server/0494-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch +++ b/patches/server/0493-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch @@ -8,7 +8,7 @@ This can realistically only happen if there's custom loot active on fishing which can return 0 items. This would disconnect the player who's fishing. diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java -index ff7b5fea13be9a64e5886f8fe337802cbc5d19b2..7f3a7a769afec8449547c26453112064b9bcb04a 100644 +index 75449d8575ac1b67aaa94d0f3fc08244728ec8a8..15fb5ee374b19366ebb23181896fb943e95819f0 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java @@ -495,9 +495,15 @@ public class FishingHook extends Projectile { diff --git a/patches/server/0495-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0494-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0495-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0494-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0496-Add-ignore-discounts-API.patch b/patches/server/0495-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0496-Add-ignore-discounts-API.patch rename to patches/server/0495-Add-ignore-discounts-API.patch diff --git a/patches/server/0497-Toggle-for-removing-existing-dragon.patch b/patches/server/0496-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0497-Toggle-for-removing-existing-dragon.patch rename to patches/server/0496-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0498-Fix-client-lag-on-advancement-loading.patch b/patches/server/0497-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0498-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0497-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0499-Item-no-age-no-player-pickup.patch b/patches/server/0498-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0499-Item-no-age-no-player-pickup.patch rename to patches/server/0498-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0500-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0499-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0500-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0499-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0501-Beacon-API-custom-effect-ranges.patch b/patches/server/0500-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0501-Beacon-API-custom-effect-ranges.patch rename to patches/server/0500-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0502-Add-API-for-quit-reason.patch b/patches/server/0501-Add-API-for-quit-reason.patch similarity index 96% rename from patches/server/0502-Add-API-for-quit-reason.patch rename to patches/server/0501-Add-API-for-quit-reason.patch index 107b7f2ebb..0f1779a761 100644 --- a/patches/server/0502-Add-API-for-quit-reason.patch +++ b/patches/server/0501-Add-API-for-quit-reason.patch @@ -25,7 +25,7 @@ index 501d17ba798c5928279a93c45de3eb6e8a3f99d6..5fa1b0d609ffc43b03f66d710a2702c2 Connection.LOGGER.debug("Failed to sent packet", throwable); ConnectionProtocol enumprotocol = this.getCurrentProtocol(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index bb939f3312eb5a5740b445cfd268f1902955d4e8..da380d88953cd1fc289f972813187a0ddedd9d36 100644 +index e6b175a62f2b151068fc7b28685b64afea1ebbc3..a56dd127776be6de0e88a356b917488f7b20d39c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -268,6 +268,7 @@ public class ServerPlayer extends Player { @@ -37,7 +37,7 @@ index bb939f3312eb5a5740b445cfd268f1902955d4e8..da380d88953cd1fc289f972813187a0d public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) { super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ebce5372a4961b8518b3c5ee1f727705c8b68152..4e9ae442a838e685e96d436e0f14ff2d1f5e81f4 100644 +index aabfccdd94d5934716a706c9189391177ff07d57..51ae3c2facb7a1dbdbc47cd681aeb6a6beb4ed72 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -503,6 +503,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0503-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0502-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0503-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0502-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0504-Expose-world-spawn-angle.patch b/patches/server/0503-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0504-Expose-world-spawn-angle.patch rename to patches/server/0503-Expose-world-spawn-angle.patch diff --git a/patches/server/0505-Add-Destroy-Speed-API.patch b/patches/server/0504-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0505-Add-Destroy-Speed-API.patch rename to patches/server/0504-Add-Destroy-Speed-API.patch diff --git a/patches/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0505-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0505-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0507-Add-LivingEntity-clearActiveItem.patch b/patches/server/0506-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0507-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0506-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0508-Add-PlayerItemCooldownEvent.patch b/patches/server/0507-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0508-Add-PlayerItemCooldownEvent.patch rename to patches/server/0507-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0509-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0508-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0509-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0508-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0510-More-lightning-API.patch b/patches/server/0509-More-lightning-API.patch similarity index 100% rename from patches/server/0510-More-lightning-API.patch rename to patches/server/0509-More-lightning-API.patch diff --git a/patches/server/0511-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0510-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0511-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0510-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0512-Added-missing-default-perms-for-commands.patch b/patches/server/0511-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0512-Added-missing-default-perms-for-commands.patch rename to patches/server/0511-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0513-Add-PlayerShearBlockEvent.patch b/patches/server/0512-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0513-Add-PlayerShearBlockEvent.patch rename to patches/server/0512-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0514-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0513-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0514-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0513-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0515-Limit-recipe-packets.patch b/patches/server/0514-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0515-Limit-recipe-packets.patch rename to patches/server/0514-Limit-recipe-packets.patch diff --git a/patches/server/0516-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0515-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0516-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0515-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0517-Player-Chunk-Load-Unload-Events.patch b/patches/server/0516-Player-Chunk-Load-Unload-Events.patch similarity index 94% rename from patches/server/0517-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0516-Player-Chunk-Load-Unload-Events.patch index 19258dae5c..e040bb583c 100644 --- a/patches/server/0517-Player-Chunk-Load-Unload-Events.patch +++ b/patches/server/0516-Player-Chunk-Load-Unload-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index da380d88953cd1fc289f972813187a0ddedd9d36..de10fe199af11525116081618609f7bfbc7b1006 100644 +index a56dd127776be6de0e88a356b917488f7b20d39c..33f8af6f2e0f3b6f456d2742bebf81f820db4832 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2164,11 +2164,21 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0518-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0517-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0518-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0517-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0519-Expose-LivingEntity-hurt-direction.patch b/patches/server/0518-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0519-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0518-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0520-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0519-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0520-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0519-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0521-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0520-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0521-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0520-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0522-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0521-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 99% rename from patches/server/0522-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0521-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch index f8d0afea2f..bfe4561949 100644 --- a/patches/server/0522-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch +++ b/patches/server/0521-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch @@ -37,7 +37,7 @@ index e7dda8959eb92c069af001126aafc759e7e7d2de..ca96b893e22de3ae7c11d5cded51edf7 CriteriaTriggers.TRADE.trigger((ServerPlayer) this.tradingPlayer, this, offer.getResult()); } diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java -index f7976bd9561601a6ce1d5b4874b08bba9754d753..6f9d59256d34446c48e4df9dbc9351856101caa2 100644 +index f15415ff5fb099a048fe0f898e15bc4303a47ef5..428bdd3183e0085368956a5abc8e9f97fbf3e478 100644 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java @@ -758,6 +758,14 @@ public abstract class AbstractContainerMenu { diff --git a/patches/server/0523-Implement-TargetHitEvent.patch b/patches/server/0522-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0523-Implement-TargetHitEvent.patch rename to patches/server/0522-Implement-TargetHitEvent.patch diff --git a/patches/server/0524-MC-4-Fix-item-position-desync.patch b/patches/server/0523-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0524-MC-4-Fix-item-position-desync.patch rename to patches/server/0523-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0525-Additional-Block-Material-API-s.patch b/patches/server/0524-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0525-Additional-Block-Material-API-s.patch rename to patches/server/0524-Additional-Block-Material-API-s.patch diff --git a/patches/server/0526-Fix-harming-potion-dupe.patch b/patches/server/0525-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0526-Fix-harming-potion-dupe.patch rename to patches/server/0525-Fix-harming-potion-dupe.patch diff --git a/patches/server/0527-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0526-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0527-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0526-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0528-Cache-burn-durations.patch b/patches/server/0527-Cache-burn-durations.patch similarity index 100% rename from patches/server/0528-Cache-burn-durations.patch rename to patches/server/0527-Cache-burn-durations.patch diff --git a/patches/server/0529-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0528-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0529-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0528-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0530-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0529-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0530-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0529-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0531-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0530-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0531-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0530-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0532-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0531-Fix-interact-event-not-being-called-in-adventure.patch similarity index 95% rename from patches/server/0532-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0531-Fix-interact-event-not-being-called-in-adventure.patch index 193208a872..cb0bbcceec 100644 --- a/patches/server/0532-Fix-interact-event-not-being-called-in-adventure.patch +++ b/patches/server/0531-Fix-interact-event-not-being-called-in-adventure.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix interact event not being called in adventure Call PlayerInteractEvent when left-clicking on a block in adventure mode diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ba07a2c243f833aa4e0370993cac25bdd13d53d4..23560d8fac37296dd1194996bc1f4b3babcde9cc 100644 +index 56e386dcc7239aecc2f86d7c3db1e42c12f430ba..ba7c390c523f83a43d62deb1ca69c0552d233c8c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1843,7 +1843,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0533-Zombie-API-breaking-doors.patch b/patches/server/0532-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0533-Zombie-API-breaking-doors.patch rename to patches/server/0532-Zombie-API-breaking-doors.patch diff --git a/patches/server/0534-Fix-nerfed-slime-when-splitting.patch b/patches/server/0533-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0534-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0533-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0535-Add-EntityLoadCrossbowEvent.patch b/patches/server/0534-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0535-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0534-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0536-Added-WorldGameRuleChangeEvent.patch b/patches/server/0535-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0536-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0535-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0537-Added-ServerResourcesReloadedEvent.patch b/patches/server/0536-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0537-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0536-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0538-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0537-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0538-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0537-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0539-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0538-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0539-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0538-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0540-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0539-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0540-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0539-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0541-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0540-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0541-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0540-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0542-Configurable-door-breaking-difficulty.patch b/patches/server/0541-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0542-Configurable-door-breaking-difficulty.patch rename to patches/server/0541-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0543-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0542-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0543-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0542-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0544-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0543-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0544-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0543-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0545-Remove-stale-POIs.patch b/patches/server/0544-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0545-Remove-stale-POIs.patch rename to patches/server/0544-Remove-stale-POIs.patch diff --git a/patches/server/0546-Fix-villager-boat-exploit.patch b/patches/server/0545-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0546-Fix-villager-boat-exploit.patch rename to patches/server/0545-Fix-villager-boat-exploit.patch diff --git a/patches/server/0547-Add-sendOpLevel-API.patch b/patches/server/0546-Add-sendOpLevel-API.patch similarity index 95% rename from patches/server/0547-Add-sendOpLevel-API.patch rename to patches/server/0546-Add-sendOpLevel-API.patch index 9b83aa61b7..a95ab6bbe7 100644 --- a/patches/server/0547-Add-sendOpLevel-API.patch +++ b/patches/server/0546-Add-sendOpLevel-API.patch @@ -32,7 +32,7 @@ index 3d05b2f37b192bf707414f4a574f79423b0f0be1..ad6a9e238d21a821e7d5c3634fbc8fc9 public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a70f67b791218f9460acb7e0f42b64905e8deb99..55c206d2bff70fd7febd5f635ea0d7a5e779a058 100644 +index 943cfb59907cb519b2f324a9e9185723ebead60d..69cfbe2c3ba14d7ebf4b29a89161b6d1d00ebc91 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -653,6 +653,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0548-Add-PaperRegistry.patch b/patches/server/0547-Add-PaperRegistry.patch similarity index 100% rename from patches/server/0548-Add-PaperRegistry.patch rename to patches/server/0547-Add-PaperRegistry.patch diff --git a/patches/server/0549-Add-StructuresLocateEvent.patch b/patches/server/0548-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0549-Add-StructuresLocateEvent.patch rename to patches/server/0548-Add-StructuresLocateEvent.patch diff --git a/patches/server/0550-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0549-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0550-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0549-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0551-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0550-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 92% rename from patches/server/0551-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0550-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch index c8da02b504..1eb191cb45 100644 --- a/patches/server/0551-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch +++ b/patches/server/0550-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch @@ -7,7 +7,7 @@ The duplicate ProjectileHitEvent in EntityFireball was removed. The event was always called before the duplicate call. diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java -index edc9f3450b56e0c5c12387b6fd51b9628732c372..97231f7328f0eebffcacdae5469027be8aeec3ae 100644 +index cf87b51d1914274bd3e32a387629be7b04cf1734..2096e8a0bdbcfc865f175f3a01ab688542481531 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java @@ -88,7 +88,7 @@ public abstract class AbstractHurtingProjectile extends Projectile { diff --git a/patches/server/0552-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0551-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 92% rename from patches/server/0552-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0551-Return-chat-component-with-empty-text-instead-of-thr.patch index 53bdf6212b..8626428239 100644 --- a/patches/server/0552-Return-chat-component-with-empty-text-instead-of-thr.patch +++ b/patches/server/0551-Return-chat-component-with-empty-text-instead-of-thr.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Return chat component with empty text instead of throwing diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java -index 6f9d59256d34446c48e4df9dbc9351856101caa2..495c605b36e2e1430988030d6c44675e0aaffd2f 100644 +index 428bdd3183e0085368956a5abc8e9f97fbf3e478..f7bce1cdad50aec0f8df9d996de7dbec38baec69 100644 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java @@ -89,7 +89,12 @@ public abstract class AbstractContainerMenu { diff --git a/patches/server/0553-Make-schedule-command-per-world.patch b/patches/server/0552-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0553-Make-schedule-command-per-world.patch rename to patches/server/0552-Make-schedule-command-per-world.patch diff --git a/patches/server/0554-Configurable-max-leash-distance.patch b/patches/server/0553-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0554-Configurable-max-leash-distance.patch rename to patches/server/0553-Configurable-max-leash-distance.patch diff --git a/patches/server/0555-Implement-BlockPreDispenseEvent.patch b/patches/server/0554-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0555-Implement-BlockPreDispenseEvent.patch rename to patches/server/0554-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0556-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0555-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0556-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0555-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0557-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0556-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0557-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0556-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0558-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0557-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0558-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0557-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0559-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0558-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0559-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0558-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0560-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0559-Reset-shield-blocking-on-dimension-change.patch similarity index 89% rename from patches/server/0560-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0559-Reset-shield-blocking-on-dimension-change.patch index 63623c4968..ac11e8ba6f 100644 --- a/patches/server/0560-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/server/0559-Reset-shield-blocking-on-dimension-change.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index de10fe199af11525116081618609f7bfbc7b1006..5cc7edca158fed862d0dd18c6d2754de6df0ec4c 100644 +index 33f8af6f2e0f3b6f456d2742bebf81f820db4832..b04c39543ea3cddf479807f93734ab727f320de4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1186,6 +1186,11 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0561-add-DragonEggFormEvent.patch b/patches/server/0560-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0561-add-DragonEggFormEvent.patch rename to patches/server/0560-add-DragonEggFormEvent.patch diff --git a/patches/server/0562-EntityMoveEvent.patch b/patches/server/0561-EntityMoveEvent.patch similarity index 100% rename from patches/server/0562-EntityMoveEvent.patch rename to patches/server/0561-EntityMoveEvent.patch diff --git a/patches/server/0563-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0562-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0563-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0562-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0564-Inline-shift-direction-fields.patch b/patches/server/0563-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0564-Inline-shift-direction-fields.patch rename to patches/server/0563-Inline-shift-direction-fields.patch diff --git a/patches/server/0565-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0564-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0565-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0564-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0566-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0565-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0566-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0565-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0567-living-entity-allow-attribute-registration.patch b/patches/server/0566-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0567-living-entity-allow-attribute-registration.patch rename to patches/server/0566-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0568-fix-dead-slime-setSize-invincibility.patch b/patches/server/0567-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0568-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0567-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0569-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0568-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0569-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0568-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0570-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0569-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0570-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0569-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0571-Expose-Tracked-Players.patch b/patches/server/0570-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0571-Expose-Tracked-Players.patch rename to patches/server/0570-Expose-Tracked-Players.patch diff --git a/patches/server/0572-Remove-streams-from-SensorNearest.patch b/patches/server/0571-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0572-Remove-streams-from-SensorNearest.patch rename to patches/server/0571-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0573-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0572-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0573-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0572-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0574-Improve-ServerGUI.patch b/patches/server/0573-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0574-Improve-ServerGUI.patch rename to patches/server/0573-Improve-ServerGUI.patch diff --git a/patches/server/0575-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0574-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0575-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0574-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0576-fix-converting-txt-to-json-file.patch b/patches/server/0575-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0576-fix-converting-txt-to-json-file.patch rename to patches/server/0575-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0577-Add-worldborder-events.patch b/patches/server/0576-Add-worldborder-events.patch similarity index 100% rename from patches/server/0577-Add-worldborder-events.patch rename to patches/server/0576-Add-worldborder-events.patch diff --git a/patches/server/0578-added-PlayerNameEntityEvent.patch b/patches/server/0577-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0578-added-PlayerNameEntityEvent.patch rename to patches/server/0577-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0579-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0578-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0579-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0578-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0580-Add-recipe-to-cook-events.patch b/patches/server/0579-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0580-Add-recipe-to-cook-events.patch rename to patches/server/0579-Add-recipe-to-cook-events.patch diff --git a/patches/server/0581-Add-Block-isValidTool.patch b/patches/server/0580-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0581-Add-Block-isValidTool.patch rename to patches/server/0580-Add-Block-isValidTool.patch diff --git a/patches/server/0582-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0581-Allow-using-signs-inside-spawn-protection.patch similarity index 94% rename from patches/server/0582-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0581-Allow-using-signs-inside-spawn-protection.patch index 59bf996fdf..c9ebb6780f 100644 --- a/patches/server/0582-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0581-Allow-using-signs-inside-spawn-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 23560d8fac37296dd1194996bc1f4b3babcde9cc..a089c23c8df93eaf10d21d550ab5129a43ad38ea 100644 +index ba7c390c523f83a43d62deb1ca69c0552d233c8c..5e87d8080da346f82431fcff34416773e0844fcf 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1835,7 +1835,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0583-Expand-world-key-API.patch b/patches/server/0582-Expand-world-key-API.patch similarity index 100% rename from patches/server/0583-Expand-world-key-API.patch rename to patches/server/0582-Expand-world-key-API.patch diff --git a/patches/server/0584-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0583-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0584-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0583-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0585-Item-Rarity-API.patch b/patches/server/0584-Item-Rarity-API.patch similarity index 100% rename from patches/server/0585-Item-Rarity-API.patch rename to patches/server/0584-Item-Rarity-API.patch diff --git a/patches/server/0586-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0585-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0586-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0585-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0587-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0586-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0587-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0586-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0588-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0587-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0588-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0587-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0588-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 91% rename from patches/server/0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0588-Don-t-ignore-result-of-PlayerEditBookEvent.patch index e985a81464..e5bd1a4a2b 100644 --- a/patches/server/0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch +++ b/patches/server/0588-Don-t-ignore-result-of-PlayerEditBookEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a089c23c8df93eaf10d21d550ab5129a43ad38ea..b40a95dbc6b06998e3fb6f675a6ac3d5b7a9c2a4 100644 +index 5e87d8080da346f82431fcff34416773e0844fcf..af5fe9d98db344113410689a5d0c9e4bffc589dc 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1282,7 +1282,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0590-Entity-load-save-limit-per-chunk.patch b/patches/server/0589-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0590-Entity-load-save-limit-per-chunk.patch rename to patches/server/0589-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0591-Expose-protocol-version.patch b/patches/server/0590-Expose-protocol-version.patch similarity index 100% rename from patches/server/0591-Expose-protocol-version.patch rename to patches/server/0590-Expose-protocol-version.patch diff --git a/patches/server/0592-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0591-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0592-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0591-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0592-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0592-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0594-Add-bypass-host-check.patch b/patches/server/0593-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0594-Add-bypass-host-check.patch rename to patches/server/0593-Add-bypass-host-check.patch diff --git a/patches/server/0595-Set-area-affect-cloud-rotation.patch b/patches/server/0594-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0595-Set-area-affect-cloud-rotation.patch rename to patches/server/0594-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0596-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0595-add-isDeeplySleeping-to-HumanEntity.patch similarity index 90% rename from patches/server/0596-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0595-add-isDeeplySleeping-to-HumanEntity.patch index 23d24c3698..8235d20096 100644 --- a/patches/server/0596-add-isDeeplySleeping-to-HumanEntity.patch +++ b/patches/server/0595-add-isDeeplySleeping-to-HumanEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index b8ba4e278de5c9a591789928c21bff26dcec2fb7..44dab523264c594aa9c619e3ee2e0d7f93982ddc 100644 +index 0117277db8402a1673c317673811c17d02edc4c9..73d8f4af09689eb549047bf1fa79254cc7736158 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -125,6 +125,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0597-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0596-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0597-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0596-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0598-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0597-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0598-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0597-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0599-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0598-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0599-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0598-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0600-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0599-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 93% rename from patches/server/0600-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0599-fix-PlayerItemHeldEvent-firing-twice.patch index 909f0b488f..d19bb1f54d 100644 --- a/patches/server/0600-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/server/0599-fix-PlayerItemHeldEvent-firing-twice.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b40a95dbc6b06998e3fb6f675a6ac3d5b7a9c2a4..b25509b00569ae8b612841b94ab243be194cb08a 100644 +index af5fe9d98db344113410689a5d0c9e4bffc589dc..908bf489f064780e6751de2762cb94668ae16d7e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2047,6 +2047,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0601-Added-PlayerDeepSleepEvent.patch b/patches/server/0600-Added-PlayerDeepSleepEvent.patch similarity index 91% rename from patches/server/0601-Added-PlayerDeepSleepEvent.patch rename to patches/server/0600-Added-PlayerDeepSleepEvent.patch index 103d8fbae0..e8d164faf5 100644 --- a/patches/server/0601-Added-PlayerDeepSleepEvent.patch +++ b/patches/server/0600-Added-PlayerDeepSleepEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added PlayerDeepSleepEvent diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 95d354bbe1e54893b3a39dae9a6414564c322fbb..f480718d3f86094f839b7dffe30871982717569e 100644 +index deb67acf5a60ea8a3cec866cd75ac036257ef0b5..c3aa6382cf2a45479d581b3957a972f814070387 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -248,6 +248,11 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0602-More-World-API.patch b/patches/server/0601-More-World-API.patch similarity index 100% rename from patches/server/0602-More-World-API.patch rename to patches/server/0601-More-World-API.patch diff --git a/patches/server/0603-Added-PlayerBedFailEnterEvent.patch b/patches/server/0602-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0603-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0602-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0604-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0603-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0604-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0603-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0605-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0604-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0605-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0604-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0606-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0605-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0606-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0605-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0607-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0606-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0607-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0606-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0608-Add-Channel-initialization-listeners.patch b/patches/server/0607-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0608-Add-Channel-initialization-listeners.patch rename to patches/server/0607-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0609-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0608-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0609-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0608-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0610-Add-more-WanderingTrader-API.patch b/patches/server/0609-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0610-Add-more-WanderingTrader-API.patch rename to patches/server/0609-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0611-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0610-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0611-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0610-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0612-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0611-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0612-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0611-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0613-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0612-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0613-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0612-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0614-Inventory-close.patch b/patches/server/0613-Inventory-close.patch similarity index 100% rename from patches/server/0614-Inventory-close.patch rename to patches/server/0613-Inventory-close.patch diff --git a/patches/server/0615-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0614-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0615-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0614-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0616-Fix-CraftPotionBrewer-cache.patch b/patches/server/0615-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0616-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0615-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0617-Add-basic-Datapack-API.patch b/patches/server/0616-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0617-Add-basic-Datapack-API.patch rename to patches/server/0616-Add-basic-Datapack-API.patch diff --git a/patches/server/0618-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0617-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0618-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0617-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0619-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0618-additions-to-PlayerGameModeChangeEvent.patch similarity index 99% rename from patches/server/0619-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0618-additions-to-PlayerGameModeChangeEvent.patch index 5a815a30aa..d5f9198d1d 100644 --- a/patches/server/0619-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0618-additions-to-PlayerGameModeChangeEvent.patch @@ -45,7 +45,7 @@ index d47f3d255eddd652fedb4aa55286b756fe962995..27c0aaf123c3e945eb24e8a3892bd8ac } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 5cc7edca158fed862d0dd18c6d2754de6df0ec4c..5428a5ee4097e29922d48564714998604ba07dbb 100644 +index b04c39543ea3cddf479807f93734ab727f320de4..1669d91153cef50f45f61b7cb2351ac854cb035b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1826,8 +1826,15 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0620-ItemStack-repair-check-API.patch b/patches/server/0619-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0620-ItemStack-repair-check-API.patch rename to patches/server/0619-ItemStack-repair-check-API.patch diff --git a/patches/server/0621-More-Enchantment-API.patch b/patches/server/0620-More-Enchantment-API.patch similarity index 100% rename from patches/server/0621-More-Enchantment-API.patch rename to patches/server/0620-More-Enchantment-API.patch diff --git a/patches/server/0622-Move-range-check-for-block-placing-up.patch b/patches/server/0621-Move-range-check-for-block-placing-up.patch similarity index 92% rename from patches/server/0622-Move-range-check-for-block-placing-up.patch rename to patches/server/0621-Move-range-check-for-block-placing-up.patch index 65b239289c..b76eccb5f3 100644 --- a/patches/server/0622-Move-range-check-for-block-placing-up.patch +++ b/patches/server/0621-Move-range-check-for-block-placing-up.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 69780a4a69048291b4898c2d0ecc57ce518ffd93..68b9c257f98617fe9e9e0492129bdbb3d22e6e0d 100644 +index b069d3b3f68adbde23f69407a8803c13d15f7d9e..9a2d9bcad94612e5c2506db5a9dcd4a3f9271a59 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1821,6 +1821,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0623-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0622-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0623-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0622-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0624-Add-Mob-lookAt-API.patch b/patches/server/0623-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0624-Add-Mob-lookAt-API.patch rename to patches/server/0623-Add-Mob-lookAt-API.patch diff --git a/patches/server/0625-Add-Unix-domain-socket-support.patch b/patches/server/0624-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0625-Add-Unix-domain-socket-support.patch rename to patches/server/0624-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0626-Add-EntityInsideBlockEvent.patch b/patches/server/0625-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0626-Add-EntityInsideBlockEvent.patch rename to patches/server/0625-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0627-Attributes-API-for-item-defaults.patch b/patches/server/0626-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0627-Attributes-API-for-item-defaults.patch rename to patches/server/0626-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0628-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0627-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0628-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0627-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0629-More-Lidded-Block-API.patch b/patches/server/0628-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0629-More-Lidded-Block-API.patch rename to patches/server/0628-More-Lidded-Block-API.patch diff --git a/patches/server/0630-Limit-item-frame-cursors-on-maps.patch b/patches/server/0629-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0630-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0629-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0631-Add-PlayerKickEvent-causes.patch b/patches/server/0630-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0631-Add-PlayerKickEvent-causes.patch rename to patches/server/0630-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0632-Add-PufferFishStateChangeEvent.patch b/patches/server/0631-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0632-Add-PufferFishStateChangeEvent.patch rename to patches/server/0631-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0633-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0632-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0633-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0632-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0634-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0633-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0634-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0633-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0635-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0634-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0635-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0634-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0636-Add-BellRevealRaiderEvent.patch b/patches/server/0635-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0636-Add-BellRevealRaiderEvent.patch rename to patches/server/0635-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0637-Fix-invulnerable-end-crystals.patch b/patches/server/0636-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0637-Fix-invulnerable-end-crystals.patch rename to patches/server/0636-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0638-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0637-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0638-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0637-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0639-Fix-dangerous-end-portal-logic.patch b/patches/server/0638-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0639-Fix-dangerous-end-portal-logic.patch rename to patches/server/0638-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0640-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0639-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0640-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0639-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0641-Make-item-validations-configurable.patch b/patches/server/0640-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0641-Make-item-validations-configurable.patch rename to patches/server/0640-Make-item-validations-configurable.patch diff --git a/patches/server/0642-Line-Of-Sight-Changes.patch b/patches/server/0641-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0642-Line-Of-Sight-Changes.patch rename to patches/server/0641-Line-Of-Sight-Changes.patch diff --git a/patches/server/0643-add-per-world-spawn-limits.patch b/patches/server/0642-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0643-add-per-world-spawn-limits.patch rename to patches/server/0642-add-per-world-spawn-limits.patch diff --git a/patches/server/0644-Fix-potions-splash-events.patch b/patches/server/0643-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0644-Fix-potions-splash-events.patch rename to patches/server/0643-Fix-potions-splash-events.patch diff --git a/patches/server/0645-Add-more-LimitedRegion-API.patch b/patches/server/0644-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0645-Add-more-LimitedRegion-API.patch rename to patches/server/0644-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0645-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 89% rename from patches/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0645-Fix-PlayerDropItemEvent-using-wrong-item.patch index 54e33cc866..710fdd8048 100644 --- a/patches/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch +++ b/patches/server/0645-Fix-PlayerDropItemEvent-using-wrong-item.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 5428a5ee4097e29922d48564714998604ba07dbb..77a3fa81d94005de4c5b7c130e893487fe7adc77 100644 +index 1669d91153cef50f45f61b7cb2351ac854cb035b..26f4f00bb3d58255c030137fa7a8c187942aaacb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2225,7 +2225,7 @@ public class ServerPlayer extends Player { @@ -18,7 +18,7 @@ index 5428a5ee4097e29922d48564714998604ba07dbb..77a3fa81d94005de4c5b7c130e893487 this.awardStat(Stats.DROP); diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index f480718d3f86094f839b7dffe30871982717569e..6ab5b6cfe0f0e9a6f837ef009e883b0eceb816c5 100644 +index c3aa6382cf2a45479d581b3957a972f814070387..9c9c7dd62a747f6d6597b01839b63840080eac82 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -718,6 +718,11 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0647-Missing-Entity-Behavior-API.patch b/patches/server/0646-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0647-Missing-Entity-Behavior-API.patch rename to patches/server/0646-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0647-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 92% rename from patches/server/0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0647-Ensure-disconnect-for-book-edit-is-called-on-main.patch index a5f5253327..ce4da42a74 100644 --- a/patches/server/0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch +++ b/patches/server/0647-Ensure-disconnect-for-book-edit-is-called-on-main.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7c0ef92a9bad6f66a5f7f466c47f76953e0d2e8d..ecabbf88fa8fc568eede8d083e9456c22613c2bd 100644 +index 6c166950247118cb1bbae4aa1fc3ee8a6790ab1b..d620f1358e0a75ccdfd9bed98b95af47b337748d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1201,7 +1201,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0649-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0648-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0649-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0648-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0650-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0649-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0650-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0649-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0651-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0650-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0651-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0650-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0652-Adds-PlayerArmSwingEvent.patch b/patches/server/0651-Adds-PlayerArmSwingEvent.patch similarity index 93% rename from patches/server/0652-Adds-PlayerArmSwingEvent.patch rename to patches/server/0651-Adds-PlayerArmSwingEvent.patch index d7a802a46b..33ab167db8 100644 --- a/patches/server/0652-Adds-PlayerArmSwingEvent.patch +++ b/patches/server/0651-Adds-PlayerArmSwingEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ecabbf88fa8fc568eede8d083e9456c22613c2bd..1d84ee2afa76ecc1c7c07bf0a21c3d1ee7213515 100644 +index d620f1358e0a75ccdfd9bed98b95af47b337748d..49c45be8d757ee11a18ce507c6397835e3911e86 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2490,7 +2490,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0653-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0652-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 96% rename from patches/server/0653-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0652-Fixes-kick-event-leave-message-not-being-sent.patch index 2d64b13037..0ddad48d90 100644 --- a/patches/server/0653-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0652-Fixes-kick-event-leave-message-not-being-sent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 77a3fa81d94005de4c5b7c130e893487fe7adc77..80aaa260c69598a403b8a364dc39caff2193ec0f 100644 +index 26f4f00bb3d58255c030137fa7a8c187942aaacb..c40028d82908a9dc939b6304d06b6cb7d2376b31 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -262,7 +262,6 @@ public class ServerPlayer extends Player { @@ -17,7 +17,7 @@ index 77a3fa81d94005de4c5b7c130e893487fe7adc77..80aaa260c69598a403b8a364dc39caff public boolean isRealPlayer; // Paper public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1d84ee2afa76ecc1c7c07bf0a21c3d1ee7213515..3ccb8f290a842487da80ed24d04d55192ed317f4 100644 +index 49c45be8d757ee11a18ce507c6397835e3911e86..470b32ce81f5303c6d6d972e79f53cd82e9669a5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -510,7 +510,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0654-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0653-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0654-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0653-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0655-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0654-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0655-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0654-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0656-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0655-Don-t-apply-cramming-damage-to-players.patch similarity index 93% rename from patches/server/0656-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0655-Don-t-apply-cramming-damage-to-players.patch index bab43b293f..5c01265067 100644 --- a/patches/server/0656-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0655-Don-t-apply-cramming-damage-to-players.patch @@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed, For those who really want it a config option is provided. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 80aaa260c69598a403b8a364dc39caff2193ec0f..ad110326b3086137a6762ef73d04ea796b3dbf39 100644 +index c40028d82908a9dc939b6304d06b6cb7d2376b31..715a719d58f3333d8c3ce761182d4932e5b08e6c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1453,7 +1453,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0657-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0656-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0657-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0656-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0658-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0657-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0658-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0657-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0659-Stinger-API.patch b/patches/server/0658-Stinger-API.patch similarity index 100% rename from patches/server/0659-Stinger-API.patch rename to patches/server/0658-Stinger-API.patch diff --git a/patches/server/0660-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0659-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0660-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0659-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0661-Add-System.out-err-catcher.patch b/patches/server/0660-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0661-Add-System.out-err-catcher.patch rename to patches/server/0660-Add-System.out-err-catcher.patch diff --git a/patches/server/0662-Fix-test-not-bootstrapping.patch b/patches/server/0661-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0662-Fix-test-not-bootstrapping.patch rename to patches/server/0661-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0663-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0662-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0663-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0662-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0664-Improve-boat-collision-performance.patch b/patches/server/0663-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0664-Improve-boat-collision-performance.patch rename to patches/server/0663-Improve-boat-collision-performance.patch diff --git a/patches/server/0665-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0664-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0665-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0664-Prevent-AFK-kick-while-watching-end-credits.patch index f6be3e59ad..2d96e2a69b 100644 --- a/patches/server/0665-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0664-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3ccb8f290a842487da80ed24d04d55192ed317f4..69d67c7c4fcdb8cbdae1a75d2a0f79987e48a581 100644 +index 470b32ce81f5303c6d6d972e79f53cd82e9669a5..15605b81993be6a88ee85fc3a9efaf3fa1669797 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -427,7 +427,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0666-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0665-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0666-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0665-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0667-Add-PlayerSetSpawnEvent.patch b/patches/server/0666-Add-PlayerSetSpawnEvent.patch similarity index 98% rename from patches/server/0667-Add-PlayerSetSpawnEvent.patch rename to patches/server/0666-Add-PlayerSetSpawnEvent.patch index 38b1f2f05e..8732c5ceaf 100644 --- a/patches/server/0667-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0666-Add-PlayerSetSpawnEvent.patch @@ -32,7 +32,7 @@ index ce1c7512cc368e196ae94ee22c6a228c975b4980..1e41de9523c5fa3b9cfced798a5c35a2 String string = resourceKey.location().toString(); if (targets.size() == 1) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ad110326b3086137a6762ef73d04ea796b3dbf39..36330e5a2b59cf4d5eb45b3d0840440a2991fc5e 100644 +index 715a719d58f3333d8c3ce761182d4932e5b08e6c..8f6ec40f9aebececd4506ce29d33f44a5eab43b7 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1294,7 +1294,7 @@ public class ServerPlayer extends Player { @@ -129,7 +129,7 @@ index 37e111589134d80fdfd7a04d624b8c1d58a2d664..53b35f003034e7f4c9dd8ccfaf773891 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 382878be59535bca2dd053e0f3b91d2f1e5ad7e1..6698798935e8e72a791aca6119a8e05588c13aee 100644 +index 99753168f6611b9844c43766f2e54a9e721cfdbc..485cbeeae012383ec959503c8b909441c25fa4d1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1305,9 +1305,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0668-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0667-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0668-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0667-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0669-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0668-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0669-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0668-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0670-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0669-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0670-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0669-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0671-Added-EntityDamageItemEvent.patch b/patches/server/0670-Added-EntityDamageItemEvent.patch similarity index 97% rename from patches/server/0671-Added-EntityDamageItemEvent.patch rename to patches/server/0670-Added-EntityDamageItemEvent.patch index fd4e1081d9..f62299682b 100644 --- a/patches/server/0671-Added-EntityDamageItemEvent.patch +++ b/patches/server/0670-Added-EntityDamageItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added EntityDamageItemEvent diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 40395738e41575a5b2b1b4020c1c60707ceac9ad..a6858017ff9468dbf4651fe62faea487a54b3878 100644 +index d16fbd7817e71f50e35bc84eb889444e35eab415..218065e92c2d0d1141359255f77eb6747dabce35 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -556,7 +556,7 @@ public final class ItemStack { diff --git a/patches/server/0672-Optimize-indirect-passenger-iteration.patch b/patches/server/0671-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0672-Optimize-indirect-passenger-iteration.patch rename to patches/server/0671-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0673-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0672-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0673-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0672-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0674-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0673-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0674-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0673-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0675-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0674-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0675-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0674-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0676-Clear-bucket-NBT-after-dispense.patch b/patches/server/0675-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0676-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0675-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0677-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0676-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0677-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0676-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0678-Add-BlockBreakBlockEvent.patch b/patches/server/0677-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0678-Add-BlockBreakBlockEvent.patch rename to patches/server/0677-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0679-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0678-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0679-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0678-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0680-More-CommandBlock-API.patch b/patches/server/0679-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0680-More-CommandBlock-API.patch rename to patches/server/0679-More-CommandBlock-API.patch diff --git a/patches/server/0681-Add-missing-team-sidebar-display-slots.patch b/patches/server/0680-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0681-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0680-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0682-Add-back-EntityPortalExitEvent.patch b/patches/server/0681-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0682-Add-back-EntityPortalExitEvent.patch rename to patches/server/0681-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0683-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0682-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0683-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0682-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0684-Get-entity-default-attributes.patch b/patches/server/0683-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0684-Get-entity-default-attributes.patch rename to patches/server/0683-Get-entity-default-attributes.patch diff --git a/patches/server/0685-Left-handed-API.patch b/patches/server/0684-Left-handed-API.patch similarity index 100% rename from patches/server/0685-Left-handed-API.patch rename to patches/server/0684-Left-handed-API.patch diff --git a/patches/server/0686-Add-more-advancement-API.patch b/patches/server/0685-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0686-Add-more-advancement-API.patch rename to patches/server/0685-Add-more-advancement-API.patch diff --git a/patches/server/0687-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0686-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0687-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0686-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0688-Add-critical-damage-API.patch b/patches/server/0687-Add-critical-damage-API.patch similarity index 97% rename from patches/server/0688-Add-critical-damage-API.patch rename to patches/server/0687-Add-critical-damage-API.patch index b2eae6d53c..f666cbb03d 100644 --- a/patches/server/0688-Add-critical-damage-API.patch +++ b/patches/server/0687-Add-critical-damage-API.patch @@ -29,7 +29,7 @@ index ed8bad446a1845befa6d5d75c40cf281fa47a9d9..8795c94e6b6474addddbb0b337a962e8 public static DamageSource fallingBlock(Entity attacker) { return (new EntityDamageSource("fallingBlock", attacker)).damageHelmet(); diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 6ab5b6cfe0f0e9a6f837ef009e883b0eceb816c5..de9302110d5a123ededb39a0b8afcfe2a13cb158 100644 +index 9c9c7dd62a747f6d6597b01839b63840080eac82..59cead9833b7d0266a0c19fdbebd42256e4f54c4 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1256,7 +1256,7 @@ public abstract class Player extends LivingEntity { @@ -60,7 +60,7 @@ index 6ab5b6cfe0f0e9a6f837ef009e883b0eceb816c5..de9302110d5a123ededb39a0b8afcfe2 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 9b487737fc83166a66f9a6cc57aa505b5243c530..8c08e07ba78e2ed042d79b692221008f59e92593 100644 +index f427ad266a1e00adb661b9e4bc7cfe2a7ec52caa..11e0601c08e66ff7fe4febc2c38b38fec8d48c91 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -372,6 +372,7 @@ public abstract class AbstractArrow extends Projectile { diff --git a/patches/server/0689-Fix-issues-with-mob-conversion.patch b/patches/server/0688-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0689-Fix-issues-with-mob-conversion.patch rename to patches/server/0688-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0690-Add-isCollidable-methods-to-various-places.patch b/patches/server/0689-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0690-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0689-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0691-Goat-ram-API.patch b/patches/server/0690-Goat-ram-API.patch similarity index 100% rename from patches/server/0691-Goat-ram-API.patch rename to patches/server/0690-Goat-ram-API.patch diff --git a/patches/server/0692-Add-API-for-resetting-a-single-score.patch b/patches/server/0691-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0692-Add-API-for-resetting-a-single-score.patch rename to patches/server/0691-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0693-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0692-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0693-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0692-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0694-Vanilla-command-permission-fixes.patch b/patches/server/0693-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0694-Vanilla-command-permission-fixes.patch rename to patches/server/0693-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0694-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 95% rename from patches/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0694-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index a786a02109..a9ccad85a7 100644 --- a/patches/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0694-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -28,7 +28,7 @@ index 2de60a2f3da7f8d30295def7045cd7535f84e37f..d984a4304e8ebbcc3147e34bd3e35a7f } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 36330e5a2b59cf4d5eb45b3d0840440a2991fc5e..5015076ff1ac2b13203588db4566b9cf6d934a28 100644 +index 8f6ec40f9aebececd4506ce29d33f44a5eab43b7..93fc24962062acf1425a475f8781b6d8827a5af8 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1595,6 +1595,18 @@ public class ServerPlayer extends Player { @@ -51,7 +51,7 @@ index 36330e5a2b59cf4d5eb45b3d0840440a2991fc5e..5015076ff1ac2b13203588db4566b9cf @Override public void doCloseContainer() { diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index de9302110d5a123ededb39a0b8afcfe2a13cb158..9f217694da600166cadf72f09266735891b7cd03 100644 +index 59cead9833b7d0266a0c19fdbebd42256e4f54c4..69900f89e7c5f8c6e33025059d7248c7e9371fe9 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -499,6 +499,11 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0696-Fix-GameProfileCache-concurrency.patch b/patches/server/0695-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0696-Fix-GameProfileCache-concurrency.patch rename to patches/server/0695-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0697-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0696-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0697-Log-when-the-async-catcher-is-tripped.patch rename to patches/server/0696-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0698-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0697-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0698-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0697-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0699-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0698-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0699-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0698-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0700-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0699-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0700-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0699-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0701-Optimise-general-POI-access.patch b/patches/server/0700-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0701-Optimise-general-POI-access.patch rename to patches/server/0700-Optimise-general-POI-access.patch diff --git a/patches/server/0702-Optimise-chunk-tick-iteration.patch b/patches/server/0701-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0702-Optimise-chunk-tick-iteration.patch rename to patches/server/0701-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0703-Execute-chunk-tasks-mid-tick.patch b/patches/server/0702-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0703-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0702-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0704-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0703-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0704-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0703-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0705-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0704-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0705-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0704-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0706-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0705-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0706-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0705-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0707-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0706-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0707-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0706-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0708-Distance-manager-tick-timings.patch b/patches/server/0707-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0708-Distance-manager-tick-timings.patch rename to patches/server/0707-Distance-manager-tick-timings.patch diff --git a/patches/server/0709-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0708-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0709-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0708-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0710-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0709-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0710-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0709-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0711-Add-packet-limiter-config.patch b/patches/server/0710-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0711-Add-packet-limiter-config.patch rename to patches/server/0710-Add-packet-limiter-config.patch diff --git a/patches/server/0712-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0711-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0712-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0711-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0713-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0712-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0713-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0712-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0714-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0713-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0714-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0713-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0715-Time-scoreboard-search.patch b/patches/server/0714-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0715-Time-scoreboard-search.patch rename to patches/server/0714-Time-scoreboard-search.patch diff --git a/patches/server/0716-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0715-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0716-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0715-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0717-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0716-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0717-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0716-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0718-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0717-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0718-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0717-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0719-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0718-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0719-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0718-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0720-Optimise-random-block-ticking.patch b/patches/server/0719-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0720-Optimise-random-block-ticking.patch rename to patches/server/0719-Optimise-random-block-ticking.patch diff --git a/patches/server/0721-Optimise-non-flush-packet-sending.patch b/patches/server/0720-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0721-Optimise-non-flush-packet-sending.patch rename to patches/server/0720-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0722-Optimise-nearby-player-lookups.patch b/patches/server/0721-Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/0722-Optimise-nearby-player-lookups.patch rename to patches/server/0721-Optimise-nearby-player-lookups.patch diff --git a/patches/server/0723-Remove-streams-for-villager-AI.patch b/patches/server/0722-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0723-Remove-streams-for-villager-AI.patch rename to patches/server/0722-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0724-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0723-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0724-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0723-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0725-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0724-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0725-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0724-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0726-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0725-Async-catch-modifications-to-critical-entity-state.patch similarity index 100% rename from patches/server/0726-Async-catch-modifications-to-critical-entity-state.patch rename to patches/server/0725-Async-catch-modifications-to-critical-entity-state.patch diff --git a/patches/server/0727-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0726-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0727-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0726-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0728-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0727-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0728-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0727-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0729-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0728-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0729-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0728-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0729-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 92% rename from patches/server/0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0729-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index f321f26513..ad22b266f9 100644 --- a/patches/server/0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/server/0729-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 69d67c7c4fcdb8cbdae1a75d2a0f79987e48a581..2b7abf42c08672194cc460e6e74e6f8e5f3c7443 100644 +index 15605b81993be6a88ee85fc3a9efaf3fa1669797..411b555415f90504adadddc67387276ba340f360 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -835,6 +835,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0731-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0730-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0731-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0730-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0732-Ensure-valid-vehicle-status.patch b/patches/server/0731-Ensure-valid-vehicle-status.patch similarity index 90% rename from patches/server/0732-Ensure-valid-vehicle-status.patch rename to patches/server/0731-Ensure-valid-vehicle-status.patch index 2746c8e4a0..5ac14513e9 100644 --- a/patches/server/0732-Ensure-valid-vehicle-status.patch +++ b/patches/server/0731-Ensure-valid-vehicle-status.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 5015076ff1ac2b13203588db4566b9cf6d934a28..e1b59a1e6fd957b45f0a73eb51487e44108af34c 100644 +index 93fc24962062acf1425a475f8781b6d8827a5af8..d5b0777219c78aaff5c87fe8f422e67952ac241b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -518,7 +518,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0733-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0732-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0733-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0732-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0734-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0733-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0734-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0733-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0735-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0734-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0735-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0734-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0736-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0735-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0736-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0735-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0737-Preserve-overstacked-loot.patch b/patches/server/0736-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0737-Preserve-overstacked-loot.patch rename to patches/server/0736-Preserve-overstacked-loot.patch diff --git a/patches/server/0738-Update-head-rotation-in-missing-places.patch b/patches/server/0737-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0738-Update-head-rotation-in-missing-places.patch rename to patches/server/0737-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0739-prevent-unintended-light-block-manipulation.patch b/patches/server/0738-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0739-prevent-unintended-light-block-manipulation.patch rename to patches/server/0738-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0740-Fix-CraftCriteria-defaults-map.patch b/patches/server/0739-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0740-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0739-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0741-Fix-upstreams-block-state-factories.patch b/patches/server/0740-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0741-Fix-upstreams-block-state-factories.patch rename to patches/server/0740-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0742-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0741-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0742-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0741-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0743-Configurable-feature-seeds.patch b/patches/server/0742-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0743-Configurable-feature-seeds.patch rename to patches/server/0742-Configurable-feature-seeds.patch diff --git a/patches/server/0744-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0743-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0744-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0743-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0745-Add-root-admin-user-detection.patch b/patches/server/0744-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0745-Add-root-admin-user-detection.patch rename to patches/server/0744-Add-root-admin-user-detection.patch diff --git a/patches/server/0746-Always-allow-item-changing-in-Fireball.patch b/patches/server/0745-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0746-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0745-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0747-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0746-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0747-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0746-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0748-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0747-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0748-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0747-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0749-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0748-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0749-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0748-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0750-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0749-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0750-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/server/0749-Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/0751-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0750-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0751-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0750-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0752-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0751-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0752-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0751-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0753-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0752-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0753-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0752-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0754-Fix-Spigot-growth-modifiers.patch b/patches/server/0753-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0754-Fix-Spigot-growth-modifiers.patch rename to patches/server/0753-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0755-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0754-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0755-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0754-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0756-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0755-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0756-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0755-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0757-Add-player-health-update-API.patch b/patches/server/0756-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0757-Add-player-health-update-API.patch rename to patches/server/0756-Add-player-health-update-API.patch diff --git a/patches/server/0758-Optimize-HashMapPalette.patch b/patches/server/0757-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0758-Optimize-HashMapPalette.patch rename to patches/server/0757-Optimize-HashMapPalette.patch diff --git a/patches/server/0759-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0758-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0759-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0758-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0759-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 99% rename from patches/server/0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0759-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch index ba54a7286b..b878128eec 100644 --- a/patches/server/0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch +++ b/patches/server/0759-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch @@ -1180,7 +1180,7 @@ index 0000000000000000000000000000000000000000..d67a40e7be030142443680c89e1763fc + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index e1b59a1e6fd957b45f0a73eb51487e44108af34c..2e3d5b38ace99ce99a8107e750c5eeaf281c8552 100644 +index d5b0777219c78aaff5c87fe8f422e67952ac241b..0c212a2136b4d275aa0d7e31af19f90d96cca2ac 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -411,7 +411,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0761-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0760-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 99% rename from patches/server/0761-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0760-Optimise-collision-checking-in-player-move-packet-ha.patch index 577d48217f..4e03570d78 100644 --- a/patches/server/0761-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/server/0760-Optimise-collision-checking-in-player-move-packet-ha.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ef8ce274f4085a76b4a7dc4ab37a110069f83537..60024e98de6a910e4db6d45d6be427a0dea6f568 100644 +index cc667a99b17fb8f87e75e552964a8cef66c19131..5adbb9bf95df8940d55f66b1e583a11e3d5c925a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -643,7 +643,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0762-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0761-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0762-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0761-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0763-Add-more-Campfire-API.patch b/patches/server/0762-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0763-Add-more-Campfire-API.patch rename to patches/server/0762-Add-more-Campfire-API.patch diff --git a/patches/server/0764-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0763-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0764-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0763-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0765-Fix-tripwire-state-inconsistency.patch b/patches/server/0764-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0765-Fix-tripwire-state-inconsistency.patch rename to patches/server/0764-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0766-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0765-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0766-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0765-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0767-Improve-scoreboard-entries.patch b/patches/server/0766-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0767-Improve-scoreboard-entries.patch rename to patches/server/0766-Improve-scoreboard-entries.patch diff --git a/patches/server/0768-Entity-powdered-snow-API.patch b/patches/server/0767-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0768-Entity-powdered-snow-API.patch rename to patches/server/0767-Entity-powdered-snow-API.patch diff --git a/patches/server/0769-Add-API-for-item-entity-health.patch b/patches/server/0768-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0769-Add-API-for-item-entity-health.patch rename to patches/server/0768-Add-API-for-item-entity-health.patch diff --git a/patches/server/0770-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0769-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0770-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0769-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0771-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0770-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0771-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0770-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0772-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0771-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0772-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0771-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0773-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0772-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0773-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0772-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0774-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0773-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0774-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0773-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0775-Fix-bees-aging-inside-hives.patch b/patches/server/0774-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0775-Fix-bees-aging-inside-hives.patch rename to patches/server/0774-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0776-Bucketable-API.patch b/patches/server/0775-Bucketable-API.patch similarity index 100% rename from patches/server/0776-Bucketable-API.patch rename to patches/server/0775-Bucketable-API.patch diff --git a/patches/server/0777-Validate-usernames.patch b/patches/server/0776-Validate-usernames.patch similarity index 100% rename from patches/server/0777-Validate-usernames.patch rename to patches/server/0776-Validate-usernames.patch diff --git a/patches/server/0778-Make-water-animal-spawn-height-configurable.patch b/patches/server/0777-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0778-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0777-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0778-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0778-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0780-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0779-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0780-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0779-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0781-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0780-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0781-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0780-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0782-Multiple-Entries-with-Scoreboards.patch b/patches/server/0781-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0782-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0781-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0783-Reset-placed-block-on-exception.patch b/patches/server/0782-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0783-Reset-placed-block-on-exception.patch rename to patches/server/0782-Reset-placed-block-on-exception.patch diff --git a/patches/server/0784-Add-configurable-height-for-slime-spawn.patch b/patches/server/0783-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0784-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0783-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0785-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0784-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0785-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0784-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0786-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0785-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0786-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0785-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0787-Kick-on-main-for-illegal-chat.patch b/patches/server/0786-Kick-on-main-for-illegal-chat.patch similarity index 97% rename from patches/server/0787-Kick-on-main-for-illegal-chat.patch rename to patches/server/0786-Kick-on-main-for-illegal-chat.patch index 0edc1567db..d25f2adee2 100644 --- a/patches/server/0787-Kick-on-main-for-illegal-chat.patch +++ b/patches/server/0786-Kick-on-main-for-illegal-chat.patch @@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for illegal characters or chat out-of-order errors. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 60024e98de6a910e4db6d45d6be427a0dea6f568..c50ac593ad5db6b65015151bcc26a9b8ed510ba5 100644 +index 5adbb9bf95df8940d55f66b1e583a11e3d5c925a..2e1141b7672907b1a0b807e4e0e0d5233480e5d6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2168,7 +2168,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0788-Multi-Block-Change-API-Implementation.patch b/patches/server/0787-Multi-Block-Change-API-Implementation.patch similarity index 97% rename from patches/server/0788-Multi-Block-Change-API-Implementation.patch rename to patches/server/0787-Multi-Block-Change-API-Implementation.patch index a837a38a59..3013eb9b82 100644 --- a/patches/server/0788-Multi-Block-Change-API-Implementation.patch +++ b/patches/server/0787-Multi-Block-Change-API-Implementation.patch @@ -25,7 +25,7 @@ index 0d851e197e65ec79386ad1f981f6d1d38b65124a..24c677e80af652952263253409c05064 public void write(FriendlyByteBuf buf) { buf.writeLong(this.sectionPos.asLong()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index bf6b08931b756b8ae59117dcb3b6cabc8456fe98..a0184fe1e61160542094d9effa59386ff1c3a4bf 100644 +index 070eaaf9b92757ead4cba398025412f68fcb8bc9..118a671cdeee8c5fd051192b7b72ad63f79e7eca 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -943,6 +943,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0789-Fix-NotePlayEvent.patch b/patches/server/0788-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0789-Fix-NotePlayEvent.patch rename to patches/server/0788-Fix-NotePlayEvent.patch diff --git a/patches/server/0790-Freeze-Tick-Lock-API.patch b/patches/server/0789-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0790-Freeze-Tick-Lock-API.patch rename to patches/server/0789-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0791-Dolphin-API.patch b/patches/server/0790-Dolphin-API.patch similarity index 100% rename from patches/server/0791-Dolphin-API.patch rename to patches/server/0790-Dolphin-API.patch diff --git a/patches/server/0792-More-PotionEffectType-API.patch b/patches/server/0791-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0792-More-PotionEffectType-API.patch rename to patches/server/0791-More-PotionEffectType-API.patch diff --git a/patches/server/0793-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0792-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0793-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0792-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0794-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0793-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0794-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0793-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0795-Add-missing-structure-set-seed-configs.patch b/patches/server/0794-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0795-Add-missing-structure-set-seed-configs.patch rename to patches/server/0794-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0796-Implement-regenerateChunk.patch b/patches/server/0795-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0796-Implement-regenerateChunk.patch rename to patches/server/0795-Implement-regenerateChunk.patch diff --git a/patches/server/0797-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0796-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 96% rename from patches/server/0797-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0796-Fix-cancelled-powdered-snow-bucket-placement.patch index c37348f1c6..cc0ba1ea78 100644 --- a/patches/server/0797-Fix-cancelled-powdered-snow-bucket-placement.patch +++ b/patches/server/0796-Fix-cancelled-powdered-snow-bucket-placement.patch @@ -20,7 +20,7 @@ index e581dc10f3c805f7f8b6e4c842092609e7e1a0f8..b0204af850ee182773ad458208cccd94 } return InteractionResult.FAIL; diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index a6858017ff9468dbf4651fe62faea487a54b3878..def4d9c5a9b311d002eb88729bdba73b30f99bb7 100644 +index 218065e92c2d0d1141359255f77eb6747dabce35..1d52646d68ff05a597a41495f288471ce60b2d29 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -345,7 +345,7 @@ public final class ItemStack { diff --git a/patches/server/0798-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0797-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0798-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0797-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0799-Add-GameEvent-tags.patch b/patches/server/0798-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0799-Add-GameEvent-tags.patch rename to patches/server/0798-Add-GameEvent-tags.patch diff --git a/patches/server/0800-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0799-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0800-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0799-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0801-Furnace-RecipesUsed-API.patch b/patches/server/0800-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0801-Furnace-RecipesUsed-API.patch rename to patches/server/0800-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0802-Configurable-sculk-sensor-listener-range.patch b/patches/server/0801-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0802-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0801-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0803-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0802-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0803-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0802-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0804-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0803-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0804-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0803-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0805-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0804-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0805-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0804-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0806-Fix-Entity-Position-Desync.patch b/patches/server/0805-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0806-Fix-Entity-Position-Desync.patch rename to patches/server/0805-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0807-Custom-Potion-Mixes.patch b/patches/server/0806-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0807-Custom-Potion-Mixes.patch rename to patches/server/0806-Custom-Potion-Mixes.patch diff --git a/patches/server/0808-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0807-Fix-Fluid-tags-isTagged-method.patch similarity index 100% rename from patches/server/0808-Fix-Fluid-tags-isTagged-method.patch rename to patches/server/0807-Fix-Fluid-tags-isTagged-method.patch diff --git a/patches/server/0809-Force-close-world-loading-screen.patch b/patches/server/0808-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0809-Force-close-world-loading-screen.patch rename to patches/server/0808-Force-close-world-loading-screen.patch diff --git a/patches/server/0810-Fix-falling-block-spawn-methods.patch b/patches/server/0809-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0810-Fix-falling-block-spawn-methods.patch rename to patches/server/0809-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0811-Expose-furnace-minecart-push-values.patch b/patches/server/0810-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0811-Expose-furnace-minecart-push-values.patch rename to patches/server/0810-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0812-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0811-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 95% rename from patches/server/0812-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0811-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch index 947885a73c..7350cdaa50 100644 --- a/patches/server/0812-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch +++ b/patches/server/0811-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch @@ -15,7 +15,7 @@ piercing arrows to avoid duplicate damage being applied. protected net.minecraft.world.entity.projectile.Projectile hitCancelled diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 740f08e5fadf9b8d277af05cc9734ceb54f54abb..09a4c0d30898bbdc05e32b6f1d4b0436a5e4af53 100644 +index 11e0601c08e66ff7fe4febc2c38b38fec8d48c91..c56bc341ebb1592af9285d5e044951e7ae2ae0b2 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -290,6 +290,19 @@ public abstract class AbstractArrow extends Projectile { diff --git a/patches/server/0813-More-Projectile-API.patch b/patches/server/0812-More-Projectile-API.patch similarity index 100% rename from patches/server/0813-More-Projectile-API.patch rename to patches/server/0812-More-Projectile-API.patch diff --git a/patches/server/0814-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0813-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0814-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0813-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0815-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0814-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 93% rename from patches/server/0815-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0814-Don-t-allow-vehicle-movement-from-players-while-tele.patch index 8f564ae01f..df97f9e145 100644 --- a/patches/server/0815-Don-t-allow-vehicle-movement-from-players-while-tele.patch +++ b/patches/server/0814-Don-t-allow-vehicle-movement-from-players-while-tele.patch @@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the regular player move packet. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c50ac593ad5db6b65015151bcc26a9b8ed510ba5..d3f002da6875ce46977c12e48c2a786135e40601 100644 +index 2e1141b7672907b1a0b807e4e0e0d5233480e5d6..023b58f9353ed8945a80243ba5af13a3ac34feb6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -573,6 +573,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0816-Implement-getComputedBiome-API.patch b/patches/server/0815-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0816-Implement-getComputedBiome-API.patch rename to patches/server/0815-Implement-getComputedBiome-API.patch diff --git a/patches/server/0817-Make-some-itemstacks-nonnull.patch b/patches/server/0816-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0817-Make-some-itemstacks-nonnull.patch rename to patches/server/0816-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0818-Implement-enchantWithLevels-API.patch b/patches/server/0817-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0818-Implement-enchantWithLevels-API.patch rename to patches/server/0817-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0819-Fix-saving-in-unloadWorld.patch b/patches/server/0818-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0819-Fix-saving-in-unloadWorld.patch rename to patches/server/0818-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0820-Buffer-OOB-setBlock-calls.patch b/patches/server/0819-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0820-Buffer-OOB-setBlock-calls.patch rename to patches/server/0819-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0821-Add-TameableDeathMessageEvent.patch b/patches/server/0820-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0821-Add-TameableDeathMessageEvent.patch rename to patches/server/0820-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0822-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0821-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0822-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0821-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0823-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0822-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 92% rename from patches/server/0823-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0822-fix-player-loottables-running-when-mob-loot-gamerule.patch index 4b828e77e2..6fd169c224 100644 --- a/patches/server/0823-fix-player-loottables-running-when-mob-loot-gamerule.patch +++ b/patches/server/0822-fix-player-loottables-running-when-mob-loot-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2e3d5b38ace99ce99a8107e750c5eeaf281c8552..a2a7e6813101e0218224701fefc423dca2e6f0f0 100644 +index 0c212a2136b4d275aa0d7e31af19f90d96cca2ac..833a431567693121acb9b4d8e8ecb71b9c583e1c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -866,12 +866,14 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0824-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0823-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0824-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0823-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0825-Guard-against-invalid-entity-positions.patch b/patches/server/0824-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0825-Guard-against-invalid-entity-positions.patch rename to patches/server/0824-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0826-cache-resource-keys.patch b/patches/server/0825-cache-resource-keys.patch similarity index 100% rename from patches/server/0826-cache-resource-keys.patch rename to patches/server/0825-cache-resource-keys.patch diff --git a/patches/server/0827-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0826-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0827-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0826-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0828-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0827-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0828-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0827-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0829-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0828-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0829-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0828-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0830-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0829-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0830-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0829-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0831-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0830-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0831-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0830-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0832-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0831-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0832-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/server/0831-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0833-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0832-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 100% rename from patches/server/0833-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0832-Pass-ServerLevel-for-gamerule-callbacks.patch diff --git a/patches/server/0834-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0833-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 93% rename from patches/server/0834-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0833-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch index 710c21cbb7..41b2304bc2 100644 --- a/patches/server/0834-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch +++ b/patches/server/0833-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add pre-unbreaking amount to PlayerItemDamageEvent diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index def4d9c5a9b311d002eb88729bdba73b30f99bb7..6860096cb8c0deecc9c1d87543d1128fb95fd2d4 100644 +index 1d52646d68ff05a597a41495f288471ce60b2d29..31eed67d07097c7eb1b06547a9f556bcc709d96c 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -572,10 +572,11 @@ public final class ItemStack { diff --git a/patches/server/0835-WorldCreator-keepSpawnLoaded.patch b/patches/server/0834-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0835-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0834-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0836-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0835-Fix-NPE-for-BlockDataMeta-getBlockData.patch similarity index 100% rename from patches/server/0836-Fix-NPE-for-BlockDataMeta-getBlockData.patch rename to patches/server/0835-Fix-NPE-for-BlockDataMeta-getBlockData.patch diff --git a/patches/server/0837-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0836-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0837-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0836-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0838-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0837-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0838-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0837-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0839-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0838-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0839-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0838-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0840-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0839-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0840-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0839-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0841-Add-PlayerStopUsingItemEvent.patch b/patches/server/0840-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0841-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0840-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0842-FallingBlock-auto-expire-setting.patch b/patches/server/0841-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0842-FallingBlock-auto-expire-setting.patch rename to patches/server/0841-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0843-Don-t-tick-markers.patch b/patches/server/0842-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0843-Don-t-tick-markers.patch rename to patches/server/0842-Don-t-tick-markers.patch diff --git a/patches/server/0844-Do-not-accept-invalid-client-settings.patch b/patches/server/0843-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0844-Do-not-accept-invalid-client-settings.patch rename to patches/server/0843-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0845-Add-support-for-Proxy-Protocol.patch b/patches/server/0844-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0845-Add-support-for-Proxy-Protocol.patch rename to patches/server/0844-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0846-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0845-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0846-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0845-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0847-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0846-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0847-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0846-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0848-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0847-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0848-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0847-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0849-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0848-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0849-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0848-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0850-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0849-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0850-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0849-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0851-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0850-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0851-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0850-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0852-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0851-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0852-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0851-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0853-Dont-resent-entity-on-art-update.patch b/patches/server/0852-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0853-Dont-resent-entity-on-art-update.patch rename to patches/server/0852-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0854-Add-WardenAngerChangeEvent.patch b/patches/server/0853-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0854-Add-WardenAngerChangeEvent.patch rename to patches/server/0853-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0855-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0854-Add-option-for-strict-advancement-dimension-checks.patch similarity index 94% rename from patches/server/0855-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0854-Add-option-for-strict-advancement-dimension-checks.patch index ae89578d9c..2f47d6f144 100644 --- a/patches/server/0855-Add-option-for-strict-advancement-dimension-checks.patch +++ b/patches/server/0854-Add-option-for-strict-advancement-dimension-checks.patch @@ -11,7 +11,7 @@ distance trigger. This adds a config option to ignore that and use the exact dimension key of the worlds involved. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a2a7e6813101e0218224701fefc423dca2e6f0f0..9ec0ae8fd404a595f4a659b10c5107421db8f1f8 100644 +index 833a431567693121acb9b4d8e8ecb71b9c583e1c..472f4b8bbd609aa3776c38a6b8cbec61a73b4209 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1258,6 +1258,12 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0856-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0855-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0856-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0855-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0857-Nameable-Banner-API.patch b/patches/server/0856-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0857-Nameable-Banner-API.patch rename to patches/server/0856-Nameable-Banner-API.patch diff --git a/patches/server/0858-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0857-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0858-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0857-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0859-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0858-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0859-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0858-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0860-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0859-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0860-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0859-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0861-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0860-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 94% rename from patches/server/0861-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/server/0860-Don-t-print-component-in-resource-pack-rejection-mes.patch index 3fec1a0323..a26d388480 100644 --- a/patches/server/0861-Don-t-print-component-in-resource-pack-rejection-mes.patch +++ b/patches/server/0860-Don-t-print-component-in-resource-pack-rejection-mes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't print component in resource pack rejection message diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6b25bfcc686f4ef52f005d794dd070958b03cd23..edfe4ce54c34eca1cd3b7289df74994560e5cb24 100644 +index 0ad005927d6b03d3fc231030bfbfdffe10f11649..fcfd8ff903dbfcd3bdeb1af68277fbc5ab0f2d91 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2041,7 +2041,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0862-Add-Player-getFishHook.patch b/patches/server/0861-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0862-Add-Player-getFishHook.patch rename to patches/server/0861-Add-Player-getFishHook.patch diff --git a/patches/server/0863-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0862-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0863-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0862-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0864-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0863-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0864-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0863-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0865-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0864-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 94% rename from patches/server/0865-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0864-Add-some-minimal-debug-information-to-chat-packet-er.patch index 3236b05f6d..19c7d24651 100644 --- a/patches/server/0865-Add-some-minimal-debug-information-to-chat-packet-er.patch +++ b/patches/server/0864-Add-some-minimal-debug-information-to-chat-packet-er.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors TODO: potentially add some kick leeway diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index edfe4ce54c34eca1cd3b7289df74994560e5cb24..b0611e3876b125c1b79e893f0de62ebca0095ac0 100644 +index fcfd8ff903dbfcd3bdeb1af68277fbc5ab0f2d91..400775b6c88a68c81a7f074844588ea308fb84ea 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2291,7 +2291,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0866-Fix-Bee-flower-NPE.patch b/patches/server/0865-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0866-Fix-Bee-flower-NPE.patch rename to patches/server/0865-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0867-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0866-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 92% rename from patches/server/0867-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0866-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch index 1605ccc33d..b1bf2a4d10 100644 --- a/patches/server/0867-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch +++ b/patches/server/0866-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b0611e3876b125c1b79e893f0de62ebca0095ac0..cccf4885385412e799215092bfbe04f2f2455fc8 100644 +index 400775b6c88a68c81a7f074844588ea308fb84ea..5f2ca04a299b61f2cce8a4dfd060485e05153650 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2536,7 +2536,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0868-More-Teleport-API.patch b/patches/server/0867-More-Teleport-API.patch similarity index 98% rename from patches/server/0868-More-Teleport-API.patch rename to patches/server/0867-More-Teleport-API.patch index 657a397ad0..d10143439e 100644 --- a/patches/server/0868-More-Teleport-API.patch +++ b/patches/server/0867-More-Teleport-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] More Teleport API public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index cccf4885385412e799215092bfbe04f2f2455fc8..189d1aa21e2fc0c9d4e73e199f56e0be1bcabc9e 100644 +index 5f2ca04a299b61f2cce8a4dfd060485e05153650..c1041c3832c73728cbb146815ca3c03b3ba41dc4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1718,11 +1718,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -71,7 +71,7 @@ index 32b9816283c8c1de929d5664733553277cf6bf3c..32c724060a532e551f0ab4e7277831bb // Let the server handle cross world teleports if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a0184fe1e61160542094d9effa59386ff1c3a4bf..a4f451b6322dc1246ff222f68efab6b49003d0f4 100644 +index 118a671cdeee8c5fd051192b7b72ad63f79e7eca..ddafba3daa668281134ec348c6fda48cfab1a007 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1198,13 +1198,92 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0869-Add-EntityPortalReadyEvent.patch b/patches/server/0868-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0869-Add-EntityPortalReadyEvent.patch rename to patches/server/0868-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0870-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0869-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0870-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0869-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0871-Send-block-entities-after-destroy-prediction.patch b/patches/server/0870-Send-block-entities-after-destroy-prediction.patch similarity index 98% rename from patches/server/0871-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0870-Send-block-entities-after-destroy-prediction.patch index 0895e311c8..feff7dfed9 100644 --- a/patches/server/0871-Send-block-entities-after-destroy-prediction.patch +++ b/patches/server/0870-Send-block-entities-after-destroy-prediction.patch @@ -57,7 +57,7 @@ index 796d17f51496974cfdfed2593753b8c09b5c81c1..13031576c20bda3bb12c926f6cd938fa } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 189d1aa21e2fc0c9d4e73e199f56e0be1bcabc9e..da2a074d8dc048351d90ca484d33f55f79c49dc1 100644 +index c1041c3832c73728cbb146815ca3c03b3ba41dc4..7183db74a3ebd7d278b7bf65de49dd1cde11611f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1863,8 +1863,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0872-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0871-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0872-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0871-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0873-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0872-Custom-Chat-Completion-Suggestions-API.patch similarity index 94% rename from patches/server/0873-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0872-Custom-Chat-Completion-Suggestions-API.patch index 804e6f36f8..4c1a01216b 100644 --- a/patches/server/0873-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/server/0872-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a4f451b6322dc1246ff222f68efab6b49003d0f4..65dc4cf2d4e607a0b28a96af4e89a049858e2c84 100644 +index ddafba3daa668281134ec348c6fda48cfab1a007..89a3ff58e574485ccfdf55db3172a74aa63b4818 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -665,6 +665,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0874-Add-missing-BlockFadeEvents.patch b/patches/server/0873-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0874-Add-missing-BlockFadeEvents.patch rename to patches/server/0873-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0875-Collision-API.patch b/patches/server/0874-Collision-API.patch similarity index 100% rename from patches/server/0875-Collision-API.patch rename to patches/server/0874-Collision-API.patch diff --git a/patches/server/0876-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0875-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0876-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0875-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0877-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0876-Remove-invalid-signature-login-stacktrace.patch similarity index 100% rename from patches/server/0877-Remove-invalid-signature-login-stacktrace.patch rename to patches/server/0876-Remove-invalid-signature-login-stacktrace.patch diff --git a/patches/server/0878-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0877-Add-async-catcher-to-PlayerConnection-internalTelepo.patch similarity index 91% rename from patches/server/0878-Add-async-catcher-to-PlayerConnection-internalTelepo.patch rename to patches/server/0877-Add-async-catcher-to-PlayerConnection-internalTelepo.patch index d154b92207..7698ed96bf 100644 --- a/patches/server/0878-Add-async-catcher-to-PlayerConnection-internalTelepo.patch +++ b/patches/server/0877-Add-async-catcher-to-PlayerConnection-internalTelepo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add async catcher to PlayerConnection internalTeleport diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index eed16d8124d6256e3e259263b26cba2cbb3582d4..50c1d6dedcb7579ce5e83599b47016e4fc8d9d9a 100644 +index 7a6736cdd31bc1832965cc72596b643deaccc07b..834b899ec913def6fe4f517f5b76c9c0f92c970b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1746,6 +1746,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0879-Block-Ticking-API.patch b/patches/server/0878-Block-Ticking-API.patch similarity index 100% rename from patches/server/0879-Block-Ticking-API.patch rename to patches/server/0878-Block-Ticking-API.patch diff --git a/patches/server/0880-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0879-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0880-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0879-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0881-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0880-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0881-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0880-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0882-Add-NamespacedKey-biome-methods.patch b/patches/server/0881-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0882-Add-NamespacedKey-biome-methods.patch rename to patches/server/0881-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0883-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0882-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0883-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0882-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0884-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0883-Workaround-for-client-lag-spikes-MC-162253.patch similarity index 100% rename from patches/server/0884-Workaround-for-client-lag-spikes-MC-162253.patch rename to patches/server/0883-Workaround-for-client-lag-spikes-MC-162253.patch diff --git a/patches/server/0885-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0884-Stop-large-look-changes-from-crashing-the-server.patch similarity index 96% rename from patches/server/0885-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0884-Stop-large-look-changes-from-crashing-the-server.patch index 81badd0182..b522ef8dac 100644 --- a/patches/server/0885-Stop-large-look-changes-from-crashing-the-server.patch +++ b/patches/server/0884-Stop-large-look-changes-from-crashing-the-server.patch @@ -54,7 +54,7 @@ index 8433a1359a742f8947a328cc621c0ff4f64977f0..c9c16dfffa782b82c1697f3819591077 this.level.getProfiler().pop(); this.animStep += f2; diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index 3eb33d83b9cfa6ac87876a6343c88ac992b60374..66476b33cede1e44db5ec166a0cea81f82ffe47a 100644 +index b226800c15f5adbc40c89b36536db23f08e2857d..893975e8587b9036f622e2088c302e33004496d2 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java @@ -246,13 +246,7 @@ public abstract class Projectile extends Entity { diff --git a/patches/server/0886-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0885-Add-custom-destroyerIdentity-to-sendBlockDamage.patch similarity index 94% rename from patches/server/0886-Add-custom-destroyerIdentity-to-sendBlockDamage.patch rename to patches/server/0885-Add-custom-destroyerIdentity-to-sendBlockDamage.patch index 5edd0d4903..bf3b9ec551 100644 --- a/patches/server/0886-Add-custom-destroyerIdentity-to-sendBlockDamage.patch +++ b/patches/server/0885-Add-custom-destroyerIdentity-to-sendBlockDamage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add custom destroyerIdentity to sendBlockDamage diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 65dc4cf2d4e607a0b28a96af4e89a049858e2c84..4d17cbc9cee3bc9578912f9329af20edb1542fe7 100644 +index 89a3ff58e574485ccfdf55db3172a74aa63b4818..6d1309e811e299984823caab24325fa6970dee57 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1028,13 +1028,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0887-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0886-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch similarity index 100% rename from patches/server/0887-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch rename to patches/server/0886-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch diff --git a/patches/server/0888-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0887-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0888-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0887-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0889-Missing-eating-regain-reason.patch b/patches/server/0888-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0889-Missing-eating-regain-reason.patch rename to patches/server/0888-Missing-eating-regain-reason.patch diff --git a/patches/server/0890-Missing-effect-cause.patch b/patches/server/0889-Missing-effect-cause.patch similarity index 100% rename from patches/server/0890-Missing-effect-cause.patch rename to patches/server/0889-Missing-effect-cause.patch diff --git a/patches/server/0891-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0890-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0891-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0890-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0892-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0891-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0892-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0891-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0893-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0892-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0893-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0892-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0894-Configurable-chat-thread-limit.patch b/patches/server/0893-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0894-Configurable-chat-thread-limit.patch rename to patches/server/0893-Configurable-chat-thread-limit.patch diff --git a/patches/server/0895-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0894-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0895-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0894-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0896-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0895-Set-position-before-player-sending-on-dimension-chan.patch similarity index 92% rename from patches/server/0896-Set-position-before-player-sending-on-dimension-chan.patch rename to patches/server/0895-Set-position-before-player-sending-on-dimension-chan.patch index d25f138b09..df2a0e624b 100644 --- a/patches/server/0896-Set-position-before-player-sending-on-dimension-chan.patch +++ b/patches/server/0895-Set-position-before-player-sending-on-dimension-chan.patch @@ -7,7 +7,7 @@ This causes a moment where the player entity is sent with the previous location, teleport packet which is sent shortly after is meant to correct that. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9ec0ae8fd404a595f4a659b10c5107421db8f1f8..40229b0dc295bcca956d8cc3c32834c6f1748bbc 100644 +index 472f4b8bbd609aa3776c38a6b8cbec61a73b4209..9187ac335e9e459df4832e95a5691db0644892e5 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1161,6 +1161,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0897-fix-Jigsaw-block-kicking-user.patch b/patches/server/0896-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0897-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0896-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0898-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0897-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0898-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0897-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0899-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0898-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch similarity index 100% rename from patches/server/0899-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch rename to patches/server/0898-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch diff --git a/patches/server/0900-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0899-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0900-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0899-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0901-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0900-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0901-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0900-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0902-Fix-custom-piglin-loved-items.patch b/patches/server/0901-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0902-Fix-custom-piglin-loved-items.patch rename to patches/server/0901-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0903-EntityPickupItemEvent-fixes.patch b/patches/server/0902-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0903-EntityPickupItemEvent-fixes.patch rename to patches/server/0902-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0904-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0903-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0904-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0903-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0905-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0904-Add-PlayerInventorySlotChangeEvent.patch similarity index 94% rename from patches/server/0905-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0904-Add-PlayerInventorySlotChangeEvent.patch index b1f2e86a94..07af25e2fc 100644 --- a/patches/server/0905-Add-PlayerInventorySlotChangeEvent.patch +++ b/patches/server/0904-Add-PlayerInventorySlotChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 40229b0dc295bcca956d8cc3c32834c6f1748bbc..85570b5c362033075114ed86746f23c24251827d 100644 +index 9187ac335e9e459df4832e95a5691db0644892e5..44c7f65d93b57cd3fff0b10c1d08a98250f3805f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -321,6 +321,25 @@ public class ServerPlayer extends Player { @@ -35,7 +35,7 @@ index 40229b0dc295bcca956d8cc3c32834c6f1748bbc..85570b5c362033075114ed86746f23c2 @Override public void dataChanged(AbstractContainerMenu handler, int property, int value) {} diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java -index 495c605b36e2e1430988030d6c44675e0aaffd2f..4e471b19f1053bf6fd0979d4446a1361edf25aa2 100644 +index f7bce1cdad50aec0f8df9d996de7dbec38baec69..fcedd5afe138a97063d2fdd50edb1da16dcff9fd 100644 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java @@ -302,7 +302,7 @@ public abstract class AbstractContainerMenu { diff --git a/patches/server/0906-Elder-Guardian-appearance-API.patch b/patches/server/0905-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0906-Elder-Guardian-appearance-API.patch rename to patches/server/0905-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0907-Allow-changing-bed-s-occupied-property.patch b/patches/server/0906-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0907-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0906-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0908-Add-entity-knockback-API.patch b/patches/server/0907-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0908-Add-entity-knockback-API.patch rename to patches/server/0907-Add-entity-knockback-API.patch diff --git a/patches/server/0909-Detect-headless-JREs.patch b/patches/server/0908-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0909-Detect-headless-JREs.patch rename to patches/server/0908-Detect-headless-JREs.patch diff --git a/patches/server/0910-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0909-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0910-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0909-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0911-optimized-dirt-and-snow-spreading.patch b/patches/server/0910-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0911-optimized-dirt-and-snow-spreading.patch rename to patches/server/0910-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0912-Added-EntityToggleSitEvent.patch b/patches/server/0911-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0912-Added-EntityToggleSitEvent.patch rename to patches/server/0911-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0913-Add-fire-tick-delay-option.patch b/patches/server/0912-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0913-Add-fire-tick-delay-option.patch rename to patches/server/0912-Add-fire-tick-delay-option.patch diff --git a/patches/server/0914-Add-Moving-Piston-API.patch b/patches/server/0913-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0914-Add-Moving-Piston-API.patch rename to patches/server/0913-Add-Moving-Piston-API.patch diff --git a/patches/server/0915-Ignore-impossible-spawn-tick.patch b/patches/server/0914-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0915-Ignore-impossible-spawn-tick.patch rename to patches/server/0914-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0916-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0915-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0916-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0915-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0917-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0916-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0917-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0916-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0918-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0917-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0918-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0917-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0919-Prevent-compass-from-loading-chunks.patch b/patches/server/0918-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0919-Prevent-compass-from-loading-chunks.patch rename to patches/server/0918-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0920-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0919-Add-PrePlayerAttackEntityEvent.patch similarity index 93% rename from patches/server/0920-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0919-Add-PrePlayerAttackEntityEvent.patch index 04f9a29ce3..c23d845d08 100644 --- a/patches/server/0920-Add-PrePlayerAttackEntityEvent.patch +++ b/patches/server/0919-Add-PrePlayerAttackEntityEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 9f217694da600166cadf72f09266735891b7cd03..9db2a97aca111862caec47220d5f13f7e5013fc7 100644 +index 69900f89e7c5f8c6e33025059d7248c7e9371fe9..875a7d2b2ecd75a51af7d158b7acee358b5082fe 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1233,8 +1233,17 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0921-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0920-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0921-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0920-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0922-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0921-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0922-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0921-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0923-Add-Player-Warden-Warning-API.patch b/patches/server/0922-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0923-Add-Player-Warden-Warning-API.patch rename to patches/server/0922-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0924-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0923-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0924-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0923-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0925-Add-paper-dumplisteners-command.patch b/patches/server/0924-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0925-Add-paper-dumplisteners-command.patch rename to patches/server/0924-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0926-check-global-player-list-where-appropriate.patch b/patches/server/0925-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0926-check-global-player-list-where-appropriate.patch rename to patches/server/0925-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0927-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0926-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0927-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0926-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0928-ItemStack-damage-API.patch b/patches/server/0927-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0928-ItemStack-damage-API.patch rename to patches/server/0927-ItemStack-damage-API.patch diff --git a/patches/server/0929-Friction-API.patch b/patches/server/0928-Friction-API.patch similarity index 100% rename from patches/server/0929-Friction-API.patch rename to patches/server/0928-Friction-API.patch diff --git a/patches/server/0930-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0929-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0930-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0929-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0931-Fix-player-kick-on-shutdown.patch b/patches/server/0930-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0931-Fix-player-kick-on-shutdown.patch rename to patches/server/0930-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0932-Sync-offhand-slot-in-menus.patch b/patches/server/0931-Sync-offhand-slot-in-menus.patch similarity index 97% rename from patches/server/0932-Sync-offhand-slot-in-menus.patch rename to patches/server/0931-Sync-offhand-slot-in-menus.patch index 841b750884..2abdfc05cc 100644 --- a/patches/server/0932-Sync-offhand-slot-in-menus.patch +++ b/patches/server/0931-Sync-offhand-slot-in-menus.patch @@ -26,7 +26,7 @@ index 44c7f65d93b57cd3fff0b10c1d08a98250f3805f..9160725f031c9698a00229c3dfa19d39 public void sendSlotChange(AbstractContainerMenu handler, int slot, ItemStack stack) { ServerPlayer.this.connection.send(new ClientboundContainerSetSlotPacket(handler.containerId, handler.incrementStateId(), slot, stack)); diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java -index 4e471b19f1053bf6fd0979d4446a1361edf25aa2..95ba37458e8154dbce6a8590508840d694fcbed1 100644 +index fcedd5afe138a97063d2fdd50edb1da16dcff9fd..143977055717c2fe27df76231da304e2863b8f1f 100644 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java @@ -200,6 +200,7 @@ public abstract class AbstractContainerMenu { diff --git a/patches/server/0933-Player-Entity-Tracking-Events.patch b/patches/server/0932-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0933-Player-Entity-Tracking-Events.patch rename to patches/server/0932-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0934-Limit-pet-look-distance.patch b/patches/server/0933-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0934-Limit-pet-look-distance.patch rename to patches/server/0933-Limit-pet-look-distance.patch diff --git a/patches/server/0935-Properly-resend-entities.patch b/patches/server/0934-Properly-resend-entities.patch similarity index 100% rename from patches/server/0935-Properly-resend-entities.patch rename to patches/server/0934-Properly-resend-entities.patch diff --git a/patches/server/0936-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0935-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0936-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0935-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0937-fix-Instruments.patch b/patches/server/0936-fix-Instruments.patch similarity index 100% rename from patches/server/0937-fix-Instruments.patch rename to patches/server/0936-fix-Instruments.patch diff --git a/patches/server/0938-Fix-chunk-snapshot-biome-getter.patch b/patches/server/0937-Fix-chunk-snapshot-biome-getter.patch similarity index 100% rename from patches/server/0938-Fix-chunk-snapshot-biome-getter.patch rename to patches/server/0937-Fix-chunk-snapshot-biome-getter.patch diff --git a/patches/server/0939-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0938-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0939-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0938-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0940-Fix-MapLike-Codec-missing-key-selector.patch b/patches/server/0939-Fix-MapLike-Codec-missing-key-selector.patch similarity index 100% rename from patches/server/0940-Fix-MapLike-Codec-missing-key-selector.patch rename to patches/server/0939-Fix-MapLike-Codec-missing-key-selector.patch diff --git a/patches/server/0941-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0940-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0941-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0940-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0942-Improve-logging-and-errors.patch b/patches/server/0941-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0942-Improve-logging-and-errors.patch rename to patches/server/0941-Improve-logging-and-errors.patch diff --git a/patches/server/0943-Fix-explosion-yield-with-new-gamerules.patch b/patches/server/0942-Fix-explosion-yield-with-new-gamerules.patch similarity index 100% rename from patches/server/0943-Fix-explosion-yield-with-new-gamerules.patch rename to patches/server/0942-Fix-explosion-yield-with-new-gamerules.patch diff --git a/patches/server/0944-Add-BlockLockCheckEvent.patch b/patches/server/0943-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0944-Add-BlockLockCheckEvent.patch rename to patches/server/0943-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0945-Add-Sneaking-API-for-Entities.patch b/patches/server/0944-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0945-Add-Sneaking-API-for-Entities.patch rename to patches/server/0944-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0946-Improve-PortalEvents.patch b/patches/server/0945-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0946-Improve-PortalEvents.patch rename to patches/server/0945-Improve-PortalEvents.patch diff --git a/patches/server/0947-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0946-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/server/0947-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/server/0946-Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/server/0948-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0947-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0948-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0947-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0949-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0948-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0949-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0948-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0950-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0949-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0950-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0949-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0951-Flying-Fall-Damage.patch b/patches/server/0950-Flying-Fall-Damage.patch similarity index 95% rename from patches/server/0951-Flying-Fall-Damage.patch rename to patches/server/0950-Flying-Fall-Damage.patch index c4571eb095..9d4defe90d 100644 --- a/patches/server/0951-Flying-Fall-Damage.patch +++ b/patches/server/0950-Flying-Fall-Damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 3b946a50ffc832f1dfe39f5f10d7cf2d8d6c65b8..746fd9ba3daac1bbc34cc583df3aa92e872c732e 100644 +index 875a7d2b2ecd75a51af7d158b7acee358b5082fe..1116116e4ba6c5ecec400cd371b70b9e14efd92b 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -181,6 +181,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0952-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0951-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0952-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0951-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0953-config-for-disabling-entity-tag-tags.patch b/patches/server/0952-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0953-config-for-disabling-entity-tag-tags.patch rename to patches/server/0952-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0954-Use-single-player-info-update-packet-on-join.patch b/patches/server/0953-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0954-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0953-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0955-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0954-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0955-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0954-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0956-Add-Player-sendEquipmentChange-Map-API.patch b/patches/server/0955-Add-Player-sendEquipmentChange-Map-API.patch similarity index 100% rename from patches/server/0956-Add-Player-sendEquipmentChange-Map-API.patch rename to patches/server/0955-Add-Player-sendEquipmentChange-Map-API.patch diff --git a/patches/server/0957-Win-Screen-API.patch b/patches/server/0956-Win-Screen-API.patch similarity index 100% rename from patches/server/0957-Win-Screen-API.patch rename to patches/server/0956-Win-Screen-API.patch diff --git a/patches/server/0958-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0957-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0958-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0957-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0959-Fix-force-opening-enchantment-tables.patch b/patches/server/0958-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0959-Fix-force-opening-enchantment-tables.patch rename to patches/server/0958-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0960-Add-Entity-Body-Yaw-API.patch b/patches/server/0959-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0960-Add-Entity-Body-Yaw-API.patch rename to patches/server/0959-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0961-Add-missing-isFuel-Material-entries.patch b/patches/server/0960-Add-missing-isFuel-Material-entries.patch similarity index 100% rename from patches/server/0961-Add-missing-isFuel-Material-entries.patch rename to patches/server/0960-Add-missing-isFuel-Material-entries.patch