diff --git a/patches/server/0268-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/removed/1.20.3/0268-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from patches/server/0268-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/removed/1.20.3/0268-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/patches/server/0395-Optimize-brigadier-child-sorting-performance.patch b/patches/removed/1.20.3/0395-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0395-Optimize-brigadier-child-sorting-performance.patch rename to patches/removed/1.20.3/0395-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch index ecb354002f..c424f6f640 100644 --- a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch +++ b/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch @@ -70,7 +70,7 @@ index 9861cd23b07f8fbacb1d125af835dee58c2debbb..e6a47317eb24fc65ed02a4d4f9c4b19b public boolean isEnchanted() { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 7278ac809eff364e8b838d63a2ec1291493869f8..ee5989e52ce0b55d8bf867ab10801ba3252c88a5 100644 +index 7278ac809eff364e8b838d63a2ec1291493869f8..0003d6508b0bd75130a3e0e21e252c5dc23a903c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -188,28 +188,11 @@ public final class CraftItemStack extends ItemStack { @@ -107,23 +107,12 @@ index 7278ac809eff364e8b838d63a2ec1291493869f8..ee5989e52ce0b55d8bf867ab10801ba3 } static boolean makeTag(net.minecraft.world.item.ItemStack item) { -@@ -235,57 +218,40 @@ public final class CraftItemStack extends ItemStack { +@@ -235,57 +218,29 @@ public final class CraftItemStack extends ItemStack { if (this.handle == null) { return 0; } - return EnchantmentHelper.getItemEnchantmentLevel(CraftEnchantment.bukkitToMinecraft(ench), this.handle); -+ // Paper start - replace to allow custom enchantments -+ final ListTag enchantments = this.handle.getEnchantmentTags(); -+ for (int i = 0; i < enchantments.size(); i++) { -+ final CompoundTag tag = enchantments.getCompound(i); -+ final String id = tag.getString(CraftMetaItem.ENCHANTMENTS_ID.NBT); -+ final Enchantment enchant = Enchantment.getByKey(CraftNamespacedKey.fromStringOrNull(id)); -+ if (ench.equals(enchant)) { -+ return EnchantmentHelper.getEnchantmentLevel(tag); -+ } -+ } -+ return 0; -+ // Paper end - replace to allow custom enchantments ++ return EnchantmentHelper.getItemEnchantmentLevel(CraftEnchantment.getRaw(ench), handle); } @Override diff --git a/patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch index 7832039dd8..792fd30cc7 100644 --- a/patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch +++ b/patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch @@ -11,10 +11,10 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set. Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 550d3290c974eebdeb4bf9b90987448c5d3d2999..93a9d53c29d9b359d9d8618254085b7fcebe8cdf 100644 +index 36bc8d587ef39baf4c85b30578d3066cb36ded21..1cd7a7ab18dca87090e7aba9c0683f937fdb6188 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -@@ -681,7 +681,7 @@ public final class CraftItemStack extends ItemStack { +@@ -670,7 +670,7 @@ public final class CraftItemStack extends ItemStack { @Override public boolean hasItemMeta() { diff --git a/patches/server/0269-Add-more-Witch-API.patch b/patches/server/0268-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0269-Add-more-Witch-API.patch rename to patches/server/0268-Add-more-Witch-API.patch diff --git a/patches/server/0270-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0269-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0270-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/server/0269-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0271-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0270-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/0271-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/server/0270-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/0272-Reset-players-airTicks-on-respawn.patch b/patches/server/0271-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/0272-Reset-players-airTicks-on-respawn.patch rename to patches/server/0271-Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/0273-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0272-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0273-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/server/0272-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0274-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0273-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from patches/server/0274-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/server/0273-Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/patches/server/0275-Optimize-World-Time-Updates.patch b/patches/server/0274-Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/0275-Optimize-World-Time-Updates.patch rename to patches/server/0274-Optimize-World-Time-Updates.patch diff --git a/patches/server/0276-Restore-custom-InventoryHolder-support.patch b/patches/server/0275-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/0276-Restore-custom-InventoryHolder-support.patch rename to patches/server/0275-Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/0277-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0276-Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from patches/server/0277-Use-Vanilla-Minecart-Speeds.patch rename to patches/server/0276-Use-Vanilla-Minecart-Speeds.patch diff --git a/patches/server/0278-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0277-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/0278-Fix-SpongeAbsortEvent-handling.patch rename to patches/server/0277-Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/0279-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0278-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from patches/server/0279-Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/server/0278-Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/patches/server/0280-Make-the-default-permission-message-configurable.patch b/patches/server/0279-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/server/0280-Make-the-default-permission-message-configurable.patch rename to patches/server/0279-Make-the-default-permission-message-configurable.patch diff --git a/patches/server/0281-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0280-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from patches/server/0281-Prevent-rayTrace-from-loading-chunks.patch rename to patches/server/0280-Prevent-rayTrace-from-loading-chunks.patch diff --git a/patches/server/0282-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0281-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0282-Handle-Large-Packets-disconnecting-client.patch rename to patches/server/0281-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/0283-force-entity-dismount-during-teleportation.patch b/patches/server/0282-force-entity-dismount-during-teleportation.patch similarity index 100% rename from patches/server/0283-force-entity-dismount-during-teleportation.patch rename to patches/server/0282-force-entity-dismount-during-teleportation.patch diff --git a/patches/server/0284-Add-more-Zombie-API.patch b/patches/server/0283-Add-more-Zombie-API.patch similarity index 100% rename from patches/server/0284-Add-more-Zombie-API.patch rename to patches/server/0283-Add-more-Zombie-API.patch diff --git a/patches/server/0285-Book-Size-Limits.patch b/patches/server/0284-Book-Size-Limits.patch similarity index 100% rename from patches/server/0285-Book-Size-Limits.patch rename to patches/server/0284-Book-Size-Limits.patch diff --git a/patches/server/0286-Add-PlayerConnectionCloseEvent.patch b/patches/server/0285-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0286-Add-PlayerConnectionCloseEvent.patch rename to patches/server/0285-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0287-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0286-Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from patches/server/0287-Prevent-Enderman-from-loading-chunks.patch rename to patches/server/0286-Prevent-Enderman-from-loading-chunks.patch diff --git a/patches/server/0288-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0287-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/server/0288-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/server/0287-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/server/0289-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0288-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 100% rename from patches/server/0289-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/server/0288-Workaround-for-vehicle-tracking-issue-on-disconnect.patch diff --git a/patches/server/0290-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0289-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch similarity index 100% rename from patches/server/0290-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch rename to patches/server/0289-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch diff --git a/patches/server/0291-BlockDestroyEvent.patch b/patches/server/0290-BlockDestroyEvent.patch similarity index 100% rename from patches/server/0291-BlockDestroyEvent.patch rename to patches/server/0290-BlockDestroyEvent.patch diff --git a/patches/server/0292-Async-command-map-building.patch b/patches/server/0291-Async-command-map-building.patch similarity index 100% rename from patches/server/0292-Async-command-map-building.patch rename to patches/server/0291-Async-command-map-building.patch diff --git a/patches/server/0293-Implement-Brigadier-Mojang-API.patch b/patches/server/0292-Implement-Brigadier-Mojang-API.patch similarity index 100% rename from patches/server/0293-Implement-Brigadier-Mojang-API.patch rename to patches/server/0292-Implement-Brigadier-Mojang-API.patch diff --git a/patches/server/0294-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0293-Improve-exact-choice-recipe-ingredients.patch similarity index 100% rename from patches/server/0294-Improve-exact-choice-recipe-ingredients.patch rename to patches/server/0293-Improve-exact-choice-recipe-ingredients.patch diff --git a/patches/server/0295-Limit-Client-Sign-length-more.patch b/patches/server/0294-Limit-Client-Sign-length-more.patch similarity index 100% rename from patches/server/0295-Limit-Client-Sign-length-more.patch rename to patches/server/0294-Limit-Client-Sign-length-more.patch diff --git a/patches/server/0296-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0295-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/0296-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/server/0295-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/0297-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0296-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from patches/server/0297-Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/server/0296-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/patches/server/0298-Entity-getEntitySpawnReason.patch b/patches/server/0297-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/server/0298-Entity-getEntitySpawnReason.patch rename to patches/server/0297-Entity-getEntitySpawnReason.patch diff --git a/patches/server/0299-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0299-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0298-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0300-Fire-event-on-GS4-query.patch b/patches/server/0299-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0300-Fire-event-on-GS4-query.patch rename to patches/server/0299-Fire-event-on-GS4-query.patch diff --git a/patches/server/0301-Implement-PlayerPostRespawnEvent.patch b/patches/server/0300-Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/0301-Implement-PlayerPostRespawnEvent.patch rename to patches/server/0300-Implement-PlayerPostRespawnEvent.patch diff --git a/patches/server/0302-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0301-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/0302-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/server/0301-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/0303-Server-Tick-Events.patch b/patches/server/0302-Server-Tick-Events.patch similarity index 100% rename from patches/server/0303-Server-Tick-Events.patch rename to patches/server/0302-Server-Tick-Events.patch diff --git a/patches/server/0304-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0303-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/0304-PlayerDeathEvent-getItemsToKeep.patch rename to patches/server/0303-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/0305-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0304-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/0305-Optimize-Captured-TileEntity-Lookup.patch rename to patches/server/0304-Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/0306-Add-Heightmap-API.patch b/patches/server/0305-Add-Heightmap-API.patch similarity index 100% rename from patches/server/0306-Add-Heightmap-API.patch rename to patches/server/0305-Add-Heightmap-API.patch diff --git a/patches/server/0307-Mob-Spawner-API-Enhancements.patch b/patches/server/0306-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/0307-Mob-Spawner-API-Enhancements.patch rename to patches/server/0306-Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/0308-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0307-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from patches/server/0308-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/server/0307-Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/patches/server/0309-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0308-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0309-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/server/0308-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0310-Implement-CraftBlockSoundGroup.patch b/patches/server/0309-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0310-Implement-CraftBlockSoundGroup.patch rename to patches/server/0309-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 100% rename from patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/server/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/patches/server/0312-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0311-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0312-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0311-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0313-Expose-the-internal-current-tick.patch b/patches/server/0312-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0313-Expose-the-internal-current-tick.patch rename to patches/server/0312-Expose-the-internal-current-tick.patch diff --git a/patches/server/0314-Fix-World-isChunkGenerated-calls.patch b/patches/server/0313-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0314-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0313-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0315-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0314-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/0315-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/server/0314-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/0316-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0315-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0316-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/server/0315-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0317-Configurable-projectile-relative-velocity.patch b/patches/server/0316-Configurable-projectile-relative-velocity.patch similarity index 93% rename from patches/server/0317-Configurable-projectile-relative-velocity.patch rename to patches/server/0316-Configurable-projectile-relative-velocity.patch index 28263a5c80..2a3669dd8e 100644 --- a/patches/server/0317-Configurable-projectile-relative-velocity.patch +++ b/patches/server/0316-Configurable-projectile-relative-velocity.patch @@ -25,10 +25,10 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this server-internal fix makes this change future-proof. 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 fec4897ffc07f71efb8725efea341ba2878a1462..621cb07c02cf318bf1b72c14724a42e0987d5b2f 100644 +index 01a2c6c3ee4e1500b6ee9986943f84dbe8663860..444119c813af920eb25706341106f0fea27befa8 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -@@ -185,7 +185,7 @@ public abstract class Projectile extends Entity implements TraceableEntity { +@@ -173,7 +173,7 @@ public abstract class Projectile extends Entity implements TraceableEntity { this.shoot((double) f5, (double) f6, (double) f7, speed, divergence); Vec3 vec3d = shooter.getDeltaMovement(); diff --git a/patches/server/0318-offset-item-frame-ticking.patch b/patches/server/0317-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0318-offset-item-frame-ticking.patch rename to patches/server/0317-offset-item-frame-ticking.patch diff --git a/patches/server/0319-Fix-MC-158900.patch b/patches/server/0318-Fix-MC-158900.patch similarity index 100% rename from patches/server/0319-Fix-MC-158900.patch rename to patches/server/0318-Fix-MC-158900.patch diff --git a/patches/server/0320-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0319-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0320-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0319-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0321-Dont-send-unnecessary-sign-update.patch b/patches/server/0320-Dont-send-unnecessary-sign-update.patch similarity index 100% rename from patches/server/0321-Dont-send-unnecessary-sign-update.patch rename to patches/server/0320-Dont-send-unnecessary-sign-update.patch diff --git a/patches/server/0322-Add-option-to-disable-pillager-patrols.patch b/patches/server/0321-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0322-Add-option-to-disable-pillager-patrols.patch rename to patches/server/0321-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0323-Flat-bedrock-generator-settings.patch b/patches/server/0322-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0323-Flat-bedrock-generator-settings.patch rename to patches/server/0322-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0324-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0323-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0324-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/server/0323-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0325-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0324-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0325-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/server/0324-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0326-Duplicate-UUID-Resolve-Option.patch b/patches/server/0325-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0326-Duplicate-UUID-Resolve-Option.patch rename to patches/server/0325-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0327-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0326-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0327-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0326-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0328-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0327-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0328-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0327-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0329-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0328-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0329-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0328-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0329-Optimise-EntityGetter-getPlayerByUUID.patch similarity index 100% rename from patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/server/0329-Optimise-EntityGetter-getPlayerByUUID.patch diff --git a/patches/server/0331-Fix-items-not-falling-correctly.patch b/patches/server/0330-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0331-Fix-items-not-falling-correctly.patch rename to patches/server/0330-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0332-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0331-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0332-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0331-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0333-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0332-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0333-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/server/0332-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0334-Entity-Activation-Range-2.0.patch b/patches/server/0333-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0334-Entity-Activation-Range-2.0.patch rename to patches/server/0333-Entity-Activation-Range-2.0.patch diff --git a/patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0334-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/server/0334-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0336-Implement-alternative-item-despawn-rate.patch b/patches/server/0335-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0336-Implement-alternative-item-despawn-rate.patch rename to patches/server/0335-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0337-Tracking-Range-Improvements.patch b/patches/server/0336-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0337-Tracking-Range-Improvements.patch rename to patches/server/0336-Tracking-Range-Improvements.patch diff --git a/patches/server/0338-Fix-items-vanishing-through-end-portal.patch b/patches/server/0337-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/0338-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0337-Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/0339-implement-optional-per-player-mob-spawns.patch b/patches/server/0338-implement-optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0339-implement-optional-per-player-mob-spawns.patch rename to patches/server/0338-implement-optional-per-player-mob-spawns.patch diff --git a/patches/server/0340-Anti-Xray.patch b/patches/server/0339-Anti-Xray.patch similarity index 100% rename from patches/server/0340-Anti-Xray.patch rename to patches/server/0339-Anti-Xray.patch diff --git a/patches/server/0341-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0340-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0341-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0340-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0342-Improve-Block-breakNaturally-API.patch b/patches/server/0341-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/0342-Improve-Block-breakNaturally-API.patch rename to patches/server/0341-Improve-Block-breakNaturally-API.patch diff --git a/patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0344-Add-debug-for-sync-chunk-loads.patch b/patches/server/0343-Add-debug-for-sync-chunk-loads.patch similarity index 100% rename from patches/server/0344-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0343-Add-debug-for-sync-chunk-loads.patch diff --git a/patches/server/0345-Improve-java-version-check.patch b/patches/server/0344-Improve-java-version-check.patch similarity index 100% rename from patches/server/0345-Improve-java-version-check.patch rename to patches/server/0344-Improve-java-version-check.patch diff --git a/patches/server/0346-Add-ThrownEggHatchEvent.patch b/patches/server/0345-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0346-Add-ThrownEggHatchEvent.patch rename to patches/server/0345-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0347-Entity-Jump-API.patch b/patches/server/0346-Entity-Jump-API.patch similarity index 100% rename from patches/server/0347-Entity-Jump-API.patch rename to patches/server/0346-Entity-Jump-API.patch diff --git a/patches/server/0348-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0347-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0348-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0347-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0349-Make-the-GUI-graph-fancier.patch b/patches/server/0348-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0349-Make-the-GUI-graph-fancier.patch rename to patches/server/0348-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0350-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0349-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0350-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0349-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0351-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0350-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0351-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0350-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0352-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0351-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0352-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0351-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0353-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0352-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0353-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0352-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0354-Optimise-Chunk-getFluid.patch b/patches/server/0353-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0354-Optimise-Chunk-getFluid.patch rename to patches/server/0353-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0355-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0354-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0355-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0354-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0356-Add-tick-times-API-and-mspt-command.patch b/patches/server/0355-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0356-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0355-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0357-Expose-MinecraftServer-isRunning.patch b/patches/server/0356-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0357-Expose-MinecraftServer-isRunning.patch rename to patches/server/0356-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0358-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0357-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0358-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0357-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0359-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0358-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from patches/server/0359-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0358-Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/patches/server/0360-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0360-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0361-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0360-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0361-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0360-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0363-Don-t-tick-dead-players.patch b/patches/server/0362-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0363-Don-t-tick-dead-players.patch rename to patches/server/0362-Don-t-tick-dead-players.patch diff --git a/patches/server/0364-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0363-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0364-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0363-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0365-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0364-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0365-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0364-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0365-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0365-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0367-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0367-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0368-Improved-Watchdog-Support.patch b/patches/server/0367-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/0368-Improved-Watchdog-Support.patch rename to patches/server/0367-Improved-Watchdog-Support.patch diff --git a/patches/server/0369-Optimize-Pathfinding.patch b/patches/server/0368-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0369-Optimize-Pathfinding.patch rename to patches/server/0368-Optimize-Pathfinding.patch diff --git a/patches/server/0370-Reduce-Either-Optional-allocation.patch b/patches/server/0369-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0370-Reduce-Either-Optional-allocation.patch rename to patches/server/0369-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0371-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0371-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0372-Prevent-opening-inventories-when-frozen.patch b/patches/server/0371-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0372-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0371-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0373-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0372-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0373-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0372-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0374-Implement-Player-Client-Options-API.patch b/patches/server/0373-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0374-Implement-Player-Client-Options-API.patch rename to patches/server/0373-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0375-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0374-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0375-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0374-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0376-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0376-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0378-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0377-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0378-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0377-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0379-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0378-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0379-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0378-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0380-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0379-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0380-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0379-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0380-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0380-Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/patches/server/0382-Villager-Restocks-API.patch b/patches/server/0381-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0382-Villager-Restocks-API.patch rename to patches/server/0381-Villager-Restocks-API.patch diff --git a/patches/server/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0382-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0382-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0384-Expose-game-version.patch b/patches/server/0383-Expose-game-version.patch similarity index 100% rename from patches/server/0384-Expose-game-version.patch rename to patches/server/0383-Expose-game-version.patch diff --git a/patches/server/0385-Optimize-Voxel-Shape-Merging.patch b/patches/server/0384-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0385-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0384-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0386-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0385-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0386-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0385-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0387-misc-debugging-dumps.patch b/patches/server/0386-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0387-misc-debugging-dumps.patch rename to patches/server/0386-misc-debugging-dumps.patch diff --git a/patches/server/0388-Prevent-teleporting-dead-entities.patch b/patches/server/0387-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0388-Prevent-teleporting-dead-entities.patch rename to patches/server/0387-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/0390-Implement-Mob-Goal-API.patch b/patches/server/0389-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0390-Implement-Mob-Goal-API.patch rename to patches/server/0389-Implement-Mob-Goal-API.patch diff --git a/patches/server/0391-Add-villager-reputation-API.patch b/patches/server/0390-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0391-Add-villager-reputation-API.patch rename to patches/server/0390-Add-villager-reputation-API.patch diff --git a/patches/server/0392-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0391-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0392-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0391-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0393-ExperienceOrbMergeEvent.patch b/patches/server/0392-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0393-ExperienceOrbMergeEvent.patch rename to patches/server/0392-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0394-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0393-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0394-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0393-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0396-Potential-bed-API.patch b/patches/server/0394-Potential-bed-API.patch similarity index 100% rename from patches/server/0396-Potential-bed-API.patch rename to patches/server/0394-Potential-bed-API.patch diff --git a/patches/server/0397-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0395-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0397-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0395-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0398-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0396-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0398-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0396-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0397-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0397-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0400-Ensure-safe-gateway-teleport.patch b/patches/server/0398-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0400-Ensure-safe-gateway-teleport.patch rename to patches/server/0398-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0401-Add-option-for-console-having-all-permissions.patch b/patches/server/0399-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0401-Add-option-for-console-having-all-permissions.patch rename to patches/server/0399-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0402-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0400-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0402-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0400-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0403-Maps-shouldn-t-load-chunks.patch b/patches/server/0401-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0403-Maps-shouldn-t-load-chunks.patch rename to patches/server/0401-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0404-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0402-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0404-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0402-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0405-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0403-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0405-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0403-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0406-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0404-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0406-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0404-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0407-Fix-sand-duping.patch b/patches/server/0405-Fix-sand-duping.patch similarity index 100% rename from patches/server/0407-Fix-sand-duping.patch rename to patches/server/0405-Fix-sand-duping.patch diff --git a/patches/server/0408-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0406-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0408-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0406-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0409-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0407-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0409-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0407-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0410-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0408-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0410-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0408-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0411-Improve-Arrow-API.patch b/patches/server/0409-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0411-Improve-Arrow-API.patch rename to patches/server/0409-Improve-Arrow-API.patch diff --git a/patches/server/0412-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0410-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0412-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0410-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0411-Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/0411-Use-distance-map-to-optimise-entity-tracker.patch diff --git a/patches/server/0414-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0412-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0414-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0412-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0415-Add-permission-for-command-blocks.patch b/patches/server/0413-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0415-Add-permission-for-command-blocks.patch rename to patches/server/0413-Add-permission-for-command-blocks.patch diff --git a/patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0414-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0414-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0417-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0415-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0417-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0415-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0418-Paper-dumpitem-command.patch b/patches/server/0416-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0418-Paper-dumpitem-command.patch rename to patches/server/0416-Paper-dumpitem-command.patch diff --git a/patches/server/0419-Improve-Legacy-Component-serialization-size.patch b/patches/server/0417-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0419-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0417-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0420-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0418-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0420-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0418-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0421-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0419-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0421-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0419-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0422-initial-work-on-native-Adventure-codecs.patch b/patches/server/0420-initial-work-on-native-Adventure-codecs.patch similarity index 100% rename from patches/server/0422-initial-work-on-native-Adventure-codecs.patch rename to patches/server/0420-initial-work-on-native-Adventure-codecs.patch diff --git a/patches/server/0423-incremental-chunk-and-player-saving.patch b/patches/server/0421-incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/0423-incremental-chunk-and-player-saving.patch rename to patches/server/0421-incremental-chunk-and-player-saving.patch diff --git a/patches/server/0424-Support-old-UUID-format-for-NBT.patch b/patches/server/0422-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0424-Support-old-UUID-format-for-NBT.patch rename to patches/server/0422-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0425-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0423-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0425-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0423-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0426-Remove-some-streams-from-structures.patch b/patches/server/0424-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0426-Remove-some-streams-from-structures.patch rename to patches/server/0424-Remove-some-streams-from-structures.patch diff --git a/patches/server/0427-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0425-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0427-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0425-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0428-Support-components-in-ItemMeta.patch b/patches/server/0426-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0428-Support-components-in-ItemMeta.patch rename to patches/server/0426-Support-components-in-ItemMeta.patch diff --git a/patches/server/0429-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0427-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0429-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0427-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0430-Add-entity-liquid-API.patch b/patches/server/0428-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0430-Add-entity-liquid-API.patch rename to patches/server/0428-Add-entity-liquid-API.patch diff --git a/patches/server/0431-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0429-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0431-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0429-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0432-Add-PrepareResultEvent.patch b/patches/server/0430-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0432-Add-PrepareResultEvent.patch rename to patches/server/0430-Add-PrepareResultEvent.patch diff --git a/patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0431-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0431-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0434-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0432-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0434-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0432-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0435-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0433-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 96% rename from patches/server/0435-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0433-Thread-Safe-Vanilla-Command-permission-checking.patch index 20e912e98a..048e161f33 100644 --- a/patches/server/0435-Thread-Safe-Vanilla-Command-permission-checking.patch +++ b/patches/server/0433-Thread-Safe-Vanilla-Command-permission-checking.patch @@ -9,7 +9,7 @@ to race conditions. Plus, .canUse we want to be safe for async anyways. diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java -index 20a7cdf87f307878d66922aaac0c60cff218e46c..39844531b03eb8a6c70700b4ecbf0ff1a557424d 100644 +index 3384501f83d445f45aa8233e98c7597daa67b8ef..6875e15aac37d3566bf04f1a6ee79a21537d2939 100644 --- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java +++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java @@ -75,10 +75,10 @@ public abstract class CommandNode implements Comparable> { diff --git a/patches/server/0436-Fix-SPIGOT-5989.patch b/patches/server/0434-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0436-Fix-SPIGOT-5989.patch rename to patches/server/0434-Fix-SPIGOT-5989.patch diff --git a/patches/server/0437-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0435-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0437-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0435-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0438-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0436-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0438-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0436-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0439-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0437-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0439-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0437-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0440-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0440-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0441-Fix-some-rails-connecting-improperly.patch b/patches/server/0439-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0441-Fix-some-rails-connecting-improperly.patch rename to patches/server/0439-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0440-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0440-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0443-Brand-support.patch b/patches/server/0441-Brand-support.patch similarity index 100% rename from patches/server/0443-Brand-support.patch rename to patches/server/0441-Brand-support.patch diff --git a/patches/server/0444-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0442-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0444-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0442-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0445-Don-t-require-FACING-data.patch b/patches/server/0443-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0445-Don-t-require-FACING-data.patch rename to patches/server/0443-Don-t-require-FACING-data.patch diff --git a/patches/server/0446-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0444-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0446-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0444-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0447-Add-moon-phase-API.patch b/patches/server/0445-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0447-Add-moon-phase-API.patch rename to patches/server/0445-Add-moon-phase-API.patch diff --git a/patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0449-Prevent-headless-pistons-from-being-created.patch b/patches/server/0447-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0449-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0447-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0450-Add-BellRingEvent.patch b/patches/server/0448-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0450-Add-BellRingEvent.patch rename to patches/server/0448-Add-BellRingEvent.patch diff --git a/patches/server/0451-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0449-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0451-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0449-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0452-Buffer-joins-to-world.patch b/patches/server/0450-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0452-Buffer-joins-to-world.patch rename to patches/server/0450-Buffer-joins-to-world.patch diff --git a/patches/server/0453-Eigencraft-redstone-implementation.patch b/patches/server/0451-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0453-Eigencraft-redstone-implementation.patch rename to patches/server/0451-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0454-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0452-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0454-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0452-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0455-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0453-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0455-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0453-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0456-Add-more-Evoker-API.patch b/patches/server/0454-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0456-Add-more-Evoker-API.patch rename to patches/server/0454-Add-more-Evoker-API.patch diff --git a/patches/server/0457-Add-methods-to-get-translation-keys.patch b/patches/server/0455-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0457-Add-methods-to-get-translation-keys.patch rename to patches/server/0455-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0458-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0456-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0458-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0456-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0459-Cache-block-data-strings.patch b/patches/server/0457-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0459-Cache-block-data-strings.patch rename to patches/server/0457-Cache-block-data-strings.patch diff --git a/patches/server/0460-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0458-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0460-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0458-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0461-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0459-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0461-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0459-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0462-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0460-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0462-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0460-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0463-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0461-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0463-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0461-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0464-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0462-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0464-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0462-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0465-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0463-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0465-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0463-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0466-Entity-isTicking.patch b/patches/server/0464-Entity-isTicking.patch similarity index 100% rename from patches/server/0466-Entity-isTicking.patch rename to patches/server/0464-Entity-isTicking.patch diff --git a/patches/server/0467-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0465-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0467-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0465-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0468-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0466-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0468-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0466-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0469-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0467-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0469-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0467-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0470-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0468-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0470-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0468-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0471-Optimise-getType-calls.patch b/patches/server/0469-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0471-Optimise-getType-calls.patch rename to patches/server/0469-Optimise-getType-calls.patch diff --git a/patches/server/0472-Villager-resetOffers.patch b/patches/server/0470-Villager-resetOffers.patch similarity index 100% rename from patches/server/0472-Villager-resetOffers.patch rename to patches/server/0470-Villager-resetOffers.patch diff --git a/patches/server/0473-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0471-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0473-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0471-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0474-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0472-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0474-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0472-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0475-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0473-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0475-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0473-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0476-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0474-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0476-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0474-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0477-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0475-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0477-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0475-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0478-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0476-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0478-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0476-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0479-Add-ignore-discounts-API.patch b/patches/server/0477-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0479-Add-ignore-discounts-API.patch rename to patches/server/0477-Add-ignore-discounts-API.patch diff --git a/patches/server/0480-Toggle-for-removing-existing-dragon.patch b/patches/server/0478-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0480-Toggle-for-removing-existing-dragon.patch rename to patches/server/0478-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0481-Fix-client-lag-on-advancement-loading.patch b/patches/server/0479-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0481-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0479-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0482-Item-no-age-no-player-pickup.patch b/patches/server/0480-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0482-Item-no-age-no-player-pickup.patch rename to patches/server/0480-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0483-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0481-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0483-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0481-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0484-Beacon-API-custom-effect-ranges.patch b/patches/server/0482-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0484-Beacon-API-custom-effect-ranges.patch rename to patches/server/0482-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0485-Add-API-for-quit-reason.patch b/patches/server/0483-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0485-Add-API-for-quit-reason.patch rename to patches/server/0483-Add-API-for-quit-reason.patch diff --git a/patches/server/0486-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0484-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0486-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0484-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0487-Expose-world-spawn-angle.patch b/patches/server/0485-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0487-Expose-world-spawn-angle.patch rename to patches/server/0485-Expose-world-spawn-angle.patch diff --git a/patches/server/0488-Add-Destroy-Speed-API.patch b/patches/server/0486-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0488-Add-Destroy-Speed-API.patch rename to patches/server/0486-Add-Destroy-Speed-API.patch diff --git a/patches/server/0489-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0487-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0489-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0487-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0490-Add-LivingEntity-clearActiveItem.patch b/patches/server/0488-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0490-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0488-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0491-Add-PlayerItemCooldownEvent.patch b/patches/server/0489-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0491-Add-PlayerItemCooldownEvent.patch rename to patches/server/0489-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0492-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0490-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0492-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0490-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0493-More-lightning-API.patch b/patches/server/0491-More-lightning-API.patch similarity index 100% rename from patches/server/0493-More-lightning-API.patch rename to patches/server/0491-More-lightning-API.patch diff --git a/patches/server/0494-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0492-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0494-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0492-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0495-Added-missing-default-perms-for-commands.patch b/patches/server/0493-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0495-Added-missing-default-perms-for-commands.patch rename to patches/server/0493-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0496-Add-PlayerShearBlockEvent.patch b/patches/server/0494-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0496-Add-PlayerShearBlockEvent.patch rename to patches/server/0494-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0497-Limit-recipe-packets.patch b/patches/server/0495-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0497-Limit-recipe-packets.patch rename to patches/server/0495-Limit-recipe-packets.patch diff --git a/patches/server/0498-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0496-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0498-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0496-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0499-Player-Chunk-Load-Unload-Events.patch b/patches/server/0497-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0499-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0497-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0500-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0498-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0500-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0498-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0501-Expose-LivingEntity-hurt-direction.patch b/patches/server/0499-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0501-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0499-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0502-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0500-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0502-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0500-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0503-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0501-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0503-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0501-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0504-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0502-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0504-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0502-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0505-Implement-TargetHitEvent.patch b/patches/server/0503-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0505-Implement-TargetHitEvent.patch rename to patches/server/0503-Implement-TargetHitEvent.patch diff --git a/patches/server/0506-MC-4-Fix-item-position-desync.patch b/patches/server/0504-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0506-MC-4-Fix-item-position-desync.patch rename to patches/server/0504-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0507-Additional-Block-Material-API-s.patch b/patches/server/0505-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0507-Additional-Block-Material-API-s.patch rename to patches/server/0505-Additional-Block-Material-API-s.patch diff --git a/patches/server/0508-Fix-harming-potion-dupe.patch b/patches/server/0506-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0508-Fix-harming-potion-dupe.patch rename to patches/server/0506-Fix-harming-potion-dupe.patch diff --git a/patches/server/0509-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0507-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0509-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0507-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0510-Cache-burn-durations.patch b/patches/server/0508-Cache-burn-durations.patch similarity index 100% rename from patches/server/0510-Cache-burn-durations.patch rename to patches/server/0508-Cache-burn-durations.patch diff --git a/patches/server/0511-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0509-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0511-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0509-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0512-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0510-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0512-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0510-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0513-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0511-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0513-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0511-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0514-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0512-Fix-interact-event-not-being-called-sometimes.patch similarity index 100% rename from patches/server/0514-Fix-interact-event-not-being-called-sometimes.patch rename to patches/server/0512-Fix-interact-event-not-being-called-sometimes.patch diff --git a/patches/server/0515-Zombie-API-breaking-doors.patch b/patches/server/0513-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0515-Zombie-API-breaking-doors.patch rename to patches/server/0513-Zombie-API-breaking-doors.patch diff --git a/patches/server/0516-Fix-nerfed-slime-when-splitting.patch b/patches/server/0514-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0516-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0514-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0517-Add-EntityLoadCrossbowEvent.patch b/patches/server/0515-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0517-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0515-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0518-Added-WorldGameRuleChangeEvent.patch b/patches/server/0516-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0518-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0516-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0519-Added-ServerResourcesReloadedEvent.patch b/patches/server/0517-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0519-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0517-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0520-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0518-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0520-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0518-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0521-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0519-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0521-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0519-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0522-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0520-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0522-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0520-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0523-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0521-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0523-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0521-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0524-Configurable-door-breaking-difficulty.patch b/patches/server/0522-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0524-Configurable-door-breaking-difficulty.patch rename to patches/server/0522-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0525-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0523-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0525-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0523-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0526-Remove-stale-POIs.patch b/patches/server/0524-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0526-Remove-stale-POIs.patch rename to patches/server/0524-Remove-stale-POIs.patch diff --git a/patches/server/0527-Fix-villager-boat-exploit.patch b/patches/server/0525-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0527-Fix-villager-boat-exploit.patch rename to patches/server/0525-Fix-villager-boat-exploit.patch diff --git a/patches/server/0528-Add-sendOpLevel-API.patch b/patches/server/0526-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0528-Add-sendOpLevel-API.patch rename to patches/server/0526-Add-sendOpLevel-API.patch diff --git a/patches/server/0529-TODO-Registry-Modification-API.patch b/patches/server/0527-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0529-TODO-Registry-Modification-API.patch rename to patches/server/0527-TODO-Registry-Modification-API.patch diff --git a/patches/server/0530-Add-StructuresLocateEvent.patch b/patches/server/0528-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0530-Add-StructuresLocateEvent.patch rename to patches/server/0528-Add-StructuresLocateEvent.patch diff --git a/patches/server/0531-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0529-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0531-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0529-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0532-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0530-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0532-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0530-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0533-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0531-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0533-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0531-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0534-Make-schedule-command-per-world.patch b/patches/server/0532-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0534-Make-schedule-command-per-world.patch rename to patches/server/0532-Make-schedule-command-per-world.patch diff --git a/patches/server/0535-Configurable-max-leash-distance.patch b/patches/server/0533-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0535-Configurable-max-leash-distance.patch rename to patches/server/0533-Configurable-max-leash-distance.patch diff --git a/patches/server/0536-Implement-BlockPreDispenseEvent.patch b/patches/server/0534-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0536-Implement-BlockPreDispenseEvent.patch rename to patches/server/0534-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0537-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0535-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0537-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0535-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0538-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0536-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0538-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0536-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0539-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0537-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0539-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0537-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0540-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0538-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0540-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0538-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0541-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0539-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0541-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0539-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0542-add-DragonEggFormEvent.patch b/patches/server/0540-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0542-add-DragonEggFormEvent.patch rename to patches/server/0540-add-DragonEggFormEvent.patch diff --git a/patches/server/0543-EntityMoveEvent.patch b/patches/server/0541-EntityMoveEvent.patch similarity index 100% rename from patches/server/0543-EntityMoveEvent.patch rename to patches/server/0541-EntityMoveEvent.patch diff --git a/patches/server/0544-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0544-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0545-Inline-shift-direction-fields.patch b/patches/server/0543-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0545-Inline-shift-direction-fields.patch rename to patches/server/0543-Inline-shift-direction-fields.patch diff --git a/patches/server/0546-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0544-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0546-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0544-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0547-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0545-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0547-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0545-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0548-living-entity-allow-attribute-registration.patch b/patches/server/0546-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0548-living-entity-allow-attribute-registration.patch rename to patches/server/0546-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0549-fix-dead-slime-setSize-invincibility.patch b/patches/server/0547-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0549-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0547-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0550-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0548-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0550-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0548-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0551-Expose-Tracked-Players.patch b/patches/server/0549-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0551-Expose-Tracked-Players.patch rename to patches/server/0549-Expose-Tracked-Players.patch diff --git a/patches/server/0552-Remove-streams-from-SensorNearest.patch b/patches/server/0550-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0552-Remove-streams-from-SensorNearest.patch rename to patches/server/0550-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0553-Improve-ServerGUI.patch b/patches/server/0551-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0553-Improve-ServerGUI.patch rename to patches/server/0551-Improve-ServerGUI.patch diff --git a/patches/server/0554-fix-converting-txt-to-json-file.patch b/patches/server/0552-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0554-fix-converting-txt-to-json-file.patch rename to patches/server/0552-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0555-Add-worldborder-events.patch b/patches/server/0553-Add-worldborder-events.patch similarity index 100% rename from patches/server/0555-Add-worldborder-events.patch rename to patches/server/0553-Add-worldborder-events.patch diff --git a/patches/server/0556-added-PlayerNameEntityEvent.patch b/patches/server/0554-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0556-added-PlayerNameEntityEvent.patch rename to patches/server/0554-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0557-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0555-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0557-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0555-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0558-Add-recipe-to-cook-events.patch b/patches/server/0556-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0558-Add-recipe-to-cook-events.patch rename to patches/server/0556-Add-recipe-to-cook-events.patch diff --git a/patches/server/0559-Add-Block-isValidTool.patch b/patches/server/0557-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0559-Add-Block-isValidTool.patch rename to patches/server/0557-Add-Block-isValidTool.patch diff --git a/patches/server/0560-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0558-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0560-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0558-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0561-Expand-world-key-API.patch b/patches/server/0559-Expand-world-key-API.patch similarity index 100% rename from patches/server/0561-Expand-world-key-API.patch rename to patches/server/0559-Expand-world-key-API.patch diff --git a/patches/server/0562-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0560-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0562-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0560-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0563-Item-Rarity-API.patch b/patches/server/0561-Item-Rarity-API.patch similarity index 100% rename from patches/server/0563-Item-Rarity-API.patch rename to patches/server/0561-Item-Rarity-API.patch diff --git a/patches/server/0564-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0562-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0564-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0562-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0565-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0563-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0565-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0563-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0566-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0564-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0566-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0564-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0567-Expose-protocol-version.patch b/patches/server/0565-Expose-protocol-version.patch similarity index 100% rename from patches/server/0567-Expose-protocol-version.patch rename to patches/server/0565-Expose-protocol-version.patch diff --git a/patches/server/0568-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0566-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0568-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0566-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0569-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0567-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0569-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0567-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0570-Add-bypass-host-check.patch b/patches/server/0568-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0570-Add-bypass-host-check.patch rename to patches/server/0568-Add-bypass-host-check.patch diff --git a/patches/server/0571-Set-area-affect-cloud-rotation.patch b/patches/server/0569-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0571-Set-area-affect-cloud-rotation.patch rename to patches/server/0569-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0572-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0570-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0572-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0570-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0573-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0571-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0573-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0571-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0574-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0572-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0574-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0572-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0575-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0573-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0575-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0573-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0576-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0574-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0576-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0574-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0577-Added-PlayerDeepSleepEvent.patch b/patches/server/0575-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0577-Added-PlayerDeepSleepEvent.patch rename to patches/server/0575-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0578-More-World-API.patch b/patches/server/0576-More-World-API.patch similarity index 100% rename from patches/server/0578-More-World-API.patch rename to patches/server/0576-More-World-API.patch diff --git a/patches/server/0579-Added-PlayerBedFailEnterEvent.patch b/patches/server/0577-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0579-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0577-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0580-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0578-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0580-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0578-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0581-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0579-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0581-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0579-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0582-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0580-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0582-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0580-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0583-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0581-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0583-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0581-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0584-Add-Channel-initialization-listeners.patch b/patches/server/0582-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0584-Add-Channel-initialization-listeners.patch rename to patches/server/0582-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0585-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0583-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0585-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0583-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0586-Add-more-WanderingTrader-API.patch b/patches/server/0584-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0586-Add-more-WanderingTrader-API.patch rename to patches/server/0584-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0587-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0585-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0587-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0585-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0588-Entity-load-save-limit-per-chunk.patch b/patches/server/0586-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0588-Entity-load-save-limit-per-chunk.patch rename to patches/server/0586-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0589-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0587-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0589-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0587-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0590-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0588-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0590-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0588-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0591-Inventory-close.patch b/patches/server/0589-Inventory-close.patch similarity index 100% rename from patches/server/0591-Inventory-close.patch rename to patches/server/0589-Inventory-close.patch diff --git a/patches/server/0592-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0590-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0592-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0590-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0593-Add-basic-Datapack-API.patch b/patches/server/0591-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0593-Add-basic-Datapack-API.patch rename to patches/server/0591-Add-basic-Datapack-API.patch diff --git a/patches/server/0594-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0592-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0594-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0592-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0595-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0593-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0595-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0593-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0596-ItemStack-repair-check-API.patch b/patches/server/0594-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0596-ItemStack-repair-check-API.patch rename to patches/server/0594-ItemStack-repair-check-API.patch diff --git a/patches/server/0597-More-Enchantment-API.patch b/patches/server/0595-More-Enchantment-API.patch similarity index 100% rename from patches/server/0597-More-Enchantment-API.patch rename to patches/server/0595-More-Enchantment-API.patch diff --git a/patches/server/0598-Move-range-check-for-block-placing-up.patch b/patches/server/0596-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0598-Move-range-check-for-block-placing-up.patch rename to patches/server/0596-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0599-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0597-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0599-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0597-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0600-Add-Mob-lookAt-API.patch b/patches/server/0598-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0600-Add-Mob-lookAt-API.patch rename to patches/server/0598-Add-Mob-lookAt-API.patch diff --git a/patches/server/0601-Add-Unix-domain-socket-support.patch b/patches/server/0599-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0601-Add-Unix-domain-socket-support.patch rename to patches/server/0599-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0602-Add-EntityInsideBlockEvent.patch b/patches/server/0600-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0602-Add-EntityInsideBlockEvent.patch rename to patches/server/0600-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0603-Attributes-API-for-item-defaults.patch b/patches/server/0601-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0603-Attributes-API-for-item-defaults.patch rename to patches/server/0601-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0604-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0604-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0605-More-Lidded-Block-API.patch b/patches/server/0603-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0605-More-Lidded-Block-API.patch rename to patches/server/0603-More-Lidded-Block-API.patch diff --git a/patches/server/0606-Limit-item-frame-cursors-on-maps.patch b/patches/server/0604-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0606-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0604-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0607-Add-PlayerKickEvent-causes.patch b/patches/server/0605-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0607-Add-PlayerKickEvent-causes.patch rename to patches/server/0605-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0608-Add-PufferFishStateChangeEvent.patch b/patches/server/0606-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0608-Add-PufferFishStateChangeEvent.patch rename to patches/server/0606-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0609-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0607-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0609-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0607-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0610-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0608-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0610-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0608-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0611-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0609-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0611-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0609-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0612-Add-BellRevealRaiderEvent.patch b/patches/server/0610-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0612-Add-BellRevealRaiderEvent.patch rename to patches/server/0610-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0613-Fix-invulnerable-end-crystals.patch b/patches/server/0611-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0613-Fix-invulnerable-end-crystals.patch rename to patches/server/0611-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0614-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0612-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0614-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0612-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0615-Fix-dangerous-end-portal-logic.patch b/patches/server/0613-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0615-Fix-dangerous-end-portal-logic.patch rename to patches/server/0613-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0616-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0614-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0616-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0614-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0617-Make-item-validations-configurable.patch b/patches/server/0615-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0617-Make-item-validations-configurable.patch rename to patches/server/0615-Make-item-validations-configurable.patch diff --git a/patches/server/0618-Line-Of-Sight-Changes.patch b/patches/server/0616-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0618-Line-Of-Sight-Changes.patch rename to patches/server/0616-Line-Of-Sight-Changes.patch diff --git a/patches/server/0619-add-per-world-spawn-limits.patch b/patches/server/0617-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0619-add-per-world-spawn-limits.patch rename to patches/server/0617-add-per-world-spawn-limits.patch diff --git a/patches/server/0620-Fix-potions-splash-events.patch b/patches/server/0618-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0620-Fix-potions-splash-events.patch rename to patches/server/0618-Fix-potions-splash-events.patch diff --git a/patches/server/0621-Add-more-LimitedRegion-API.patch b/patches/server/0619-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0621-Add-more-LimitedRegion-API.patch rename to patches/server/0619-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0622-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0620-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0622-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0620-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0623-Missing-Entity-API.patch b/patches/server/0621-Missing-Entity-API.patch similarity index 100% rename from patches/server/0623-Missing-Entity-API.patch rename to patches/server/0621-Missing-Entity-API.patch diff --git a/patches/server/0624-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0622-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0624-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0622-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0625-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0623-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0625-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0623-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0626-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0626-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0627-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0625-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0627-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0625-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0628-Adds-PlayerArmSwingEvent.patch b/patches/server/0626-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0628-Adds-PlayerArmSwingEvent.patch rename to patches/server/0626-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0629-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0627-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0629-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0627-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0630-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0628-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0630-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0628-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0631-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0629-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0631-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0629-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0632-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0630-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0632-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0630-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0633-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0631-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0633-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0631-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0634-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0632-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0634-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0632-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0635-Stinger-API.patch b/patches/server/0633-Stinger-API.patch similarity index 100% rename from patches/server/0635-Stinger-API.patch rename to patches/server/0633-Stinger-API.patch diff --git a/patches/server/0636-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0634-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0636-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0634-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0637-Add-System.out-err-catcher.patch b/patches/server/0635-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0637-Add-System.out-err-catcher.patch rename to patches/server/0635-Add-System.out-err-catcher.patch diff --git a/patches/server/0638-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0636-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0638-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0636-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0639-Improve-boat-collision-performance.patch b/patches/server/0637-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0639-Improve-boat-collision-performance.patch rename to patches/server/0637-Improve-boat-collision-performance.patch diff --git a/patches/server/0640-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0638-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0640-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0638-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0641-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0639-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0641-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0639-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0642-Add-PlayerSetSpawnEvent.patch b/patches/server/0640-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0642-Add-PlayerSetSpawnEvent.patch rename to patches/server/0640-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0643-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0641-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0643-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0641-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0644-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0642-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0644-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0642-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0645-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0643-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0645-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0643-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0646-Added-EntityDamageItemEvent.patch b/patches/server/0644-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0646-Added-EntityDamageItemEvent.patch rename to patches/server/0644-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0647-Optimize-indirect-passenger-iteration.patch b/patches/server/0645-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0647-Optimize-indirect-passenger-iteration.patch rename to patches/server/0645-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0648-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0646-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0648-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0646-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0649-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0647-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0649-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0647-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0650-Clear-bucket-NBT-after-dispense.patch b/patches/server/0648-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0650-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0648-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0651-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0649-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0651-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0649-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0652-Add-BlockBreakBlockEvent.patch b/patches/server/0650-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0652-Add-BlockBreakBlockEvent.patch rename to patches/server/0650-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0653-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0651-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0653-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0651-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0654-More-CommandBlock-API.patch b/patches/server/0652-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0654-More-CommandBlock-API.patch rename to patches/server/0652-More-CommandBlock-API.patch diff --git a/patches/server/0655-Add-missing-team-sidebar-display-slots.patch b/patches/server/0653-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0655-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0653-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0656-Add-back-EntityPortalExitEvent.patch b/patches/server/0654-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0656-Add-back-EntityPortalExitEvent.patch rename to patches/server/0654-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0657-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0655-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0657-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0655-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0658-Get-entity-default-attributes.patch b/patches/server/0656-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0658-Get-entity-default-attributes.patch rename to patches/server/0656-Get-entity-default-attributes.patch diff --git a/patches/server/0659-Left-handed-API.patch b/patches/server/0657-Left-handed-API.patch similarity index 100% rename from patches/server/0659-Left-handed-API.patch rename to patches/server/0657-Left-handed-API.patch diff --git a/patches/server/0660-Add-more-advancement-API.patch b/patches/server/0658-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0660-Add-more-advancement-API.patch rename to patches/server/0658-Add-more-advancement-API.patch diff --git a/patches/server/0661-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0659-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0661-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0659-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0662-Add-critical-damage-API.patch b/patches/server/0660-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0662-Add-critical-damage-API.patch rename to patches/server/0660-Add-critical-damage-API.patch diff --git a/patches/server/0663-Fix-issues-with-mob-conversion.patch b/patches/server/0661-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0663-Fix-issues-with-mob-conversion.patch rename to patches/server/0661-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0664-Add-isCollidable-methods-to-various-places.patch b/patches/server/0662-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0664-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0662-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0665-Goat-ram-API.patch b/patches/server/0663-Goat-ram-API.patch similarity index 100% rename from patches/server/0665-Goat-ram-API.patch rename to patches/server/0663-Goat-ram-API.patch diff --git a/patches/server/0666-Add-API-for-resetting-a-single-score.patch b/patches/server/0664-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0666-Add-API-for-resetting-a-single-score.patch rename to patches/server/0664-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0667-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0665-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0667-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0665-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0668-Vanilla-command-permission-fixes.patch b/patches/server/0666-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0668-Vanilla-command-permission-fixes.patch rename to patches/server/0666-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0669-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0667-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0669-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0667-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0670-Fix-GameProfileCache-concurrency.patch b/patches/server/0668-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0670-Fix-GameProfileCache-concurrency.patch rename to patches/server/0668-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0671-Improve-and-expand-AsyncCatcher.patch b/patches/server/0669-Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/0671-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0669-Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/0672-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0670-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0672-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0670-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0673-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0671-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0673-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0671-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0674-Optimise-general-POI-access.patch b/patches/server/0672-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0674-Optimise-general-POI-access.patch rename to patches/server/0672-Optimise-general-POI-access.patch diff --git a/patches/server/0675-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0673-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0675-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0673-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0676-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0674-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0676-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0674-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0677-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0675-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0677-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0675-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0678-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0676-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0678-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0676-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0679-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0677-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0679-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0677-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0680-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0678-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0680-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0678-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0681-Time-scoreboard-search.patch b/patches/server/0679-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0681-Time-scoreboard-search.patch rename to patches/server/0679-Time-scoreboard-search.patch diff --git a/patches/server/0682-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0680-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0682-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0680-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0683-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0681-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0683-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0681-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0684-Execute-chunk-tasks-mid-tick.patch b/patches/server/0682-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0684-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0682-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0685-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0683-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0685-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0683-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0686-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0684-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0686-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0684-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0687-Optimise-random-block-ticking.patch b/patches/server/0685-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0687-Optimise-random-block-ticking.patch rename to patches/server/0685-Optimise-random-block-ticking.patch diff --git a/patches/server/0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0689-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0687-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0689-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0687-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0690-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0688-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0690-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0688-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0691-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0689-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0691-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0689-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0692-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0690-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0692-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0690-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0693-Distance-manager-tick-timings.patch b/patches/server/0691-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0693-Distance-manager-tick-timings.patch rename to patches/server/0691-Distance-manager-tick-timings.patch diff --git a/patches/server/0694-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0692-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0694-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0692-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0695-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0693-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0695-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0693-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0696-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0694-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0696-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0694-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0697-Add-packet-limiter-config.patch b/patches/server/0695-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0697-Add-packet-limiter-config.patch rename to patches/server/0695-Add-packet-limiter-config.patch diff --git a/patches/server/0698-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0696-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0698-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0696-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0699-Ensure-valid-vehicle-status.patch b/patches/server/0697-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0699-Ensure-valid-vehicle-status.patch rename to patches/server/0697-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0700-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0698-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0700-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0698-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0701-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0699-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0701-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0699-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0702-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0700-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0702-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0700-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0703-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0701-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0703-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0701-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0704-Preserve-overstacked-loot.patch b/patches/server/0702-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0704-Preserve-overstacked-loot.patch rename to patches/server/0702-Preserve-overstacked-loot.patch diff --git a/patches/server/0705-Update-head-rotation-in-missing-places.patch b/patches/server/0703-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0705-Update-head-rotation-in-missing-places.patch rename to patches/server/0703-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0706-prevent-unintended-light-block-manipulation.patch b/patches/server/0704-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0706-prevent-unintended-light-block-manipulation.patch rename to patches/server/0704-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0707-Fix-CraftCriteria-defaults-map.patch b/patches/server/0705-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0707-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0705-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0708-Fix-upstreams-block-state-factories.patch b/patches/server/0706-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0708-Fix-upstreams-block-state-factories.patch rename to patches/server/0706-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0709-Configurable-feature-seeds.patch b/patches/server/0707-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0709-Configurable-feature-seeds.patch rename to patches/server/0707-Configurable-feature-seeds.patch diff --git a/patches/server/0710-Add-root-admin-user-detection.patch b/patches/server/0708-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0710-Add-root-admin-user-detection.patch rename to patches/server/0708-Add-root-admin-user-detection.patch diff --git a/patches/server/0711-Always-allow-item-changing-in-Fireball.patch b/patches/server/0709-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0711-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0709-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0712-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0710-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0712-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0710-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0713-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0711-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0713-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0711-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0714-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0712-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0714-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0712-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0715-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0713-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0715-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0713-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0716-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0714-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0716-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0714-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0717-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0715-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0717-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0715-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0718-Fix-Spigot-growth-modifiers.patch b/patches/server/0716-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0718-Fix-Spigot-growth-modifiers.patch rename to patches/server/0716-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0719-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0717-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0719-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0717-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0720-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0718-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0720-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0718-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0721-Optimize-HashMapPalette.patch b/patches/server/0719-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0721-Optimize-HashMapPalette.patch rename to patches/server/0719-Optimize-HashMapPalette.patch diff --git a/patches/server/0722-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0720-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0722-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0720-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0723-Collision-optimisations.patch b/patches/server/0721-Collision-optimisations.patch similarity index 100% rename from patches/server/0723-Collision-optimisations.patch rename to patches/server/0721-Collision-optimisations.patch diff --git a/patches/server/0724-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0722-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0724-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0722-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0725-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0723-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0725-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0723-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0726-Add-more-Campfire-API.patch b/patches/server/0724-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0726-Add-more-Campfire-API.patch rename to patches/server/0724-Add-more-Campfire-API.patch diff --git a/patches/server/0727-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0725-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0727-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0725-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0728-Fix-tripwire-state-inconsistency.patch b/patches/server/0726-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0728-Fix-tripwire-state-inconsistency.patch rename to patches/server/0726-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0729-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0727-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0729-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0727-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0730-Improve-scoreboard-entries.patch b/patches/server/0728-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0730-Improve-scoreboard-entries.patch rename to patches/server/0728-Improve-scoreboard-entries.patch diff --git a/patches/server/0731-Entity-powdered-snow-API.patch b/patches/server/0729-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0731-Entity-powdered-snow-API.patch rename to patches/server/0729-Entity-powdered-snow-API.patch diff --git a/patches/server/0732-Add-API-for-item-entity-health.patch b/patches/server/0730-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0732-Add-API-for-item-entity-health.patch rename to patches/server/0730-Add-API-for-item-entity-health.patch diff --git a/patches/server/0733-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0731-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0733-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0731-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0734-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0732-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0734-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0732-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0735-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0733-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0735-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0733-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0736-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0734-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0736-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0734-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0737-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0735-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0737-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0735-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0738-Fix-bees-aging-inside-hives.patch b/patches/server/0736-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0738-Fix-bees-aging-inside-hives.patch rename to patches/server/0736-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0739-Bucketable-API.patch b/patches/server/0737-Bucketable-API.patch similarity index 100% rename from patches/server/0739-Bucketable-API.patch rename to patches/server/0737-Bucketable-API.patch diff --git a/patches/server/0740-Validate-usernames.patch b/patches/server/0738-Validate-usernames.patch similarity index 100% rename from patches/server/0740-Validate-usernames.patch rename to patches/server/0738-Validate-usernames.patch diff --git a/patches/server/0741-Make-water-animal-spawn-height-configurable.patch b/patches/server/0739-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0741-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0739-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0742-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0740-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0742-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0740-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0743-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0741-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0743-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0741-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0744-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0742-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0744-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0742-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0745-Multiple-Entries-with-Scoreboards.patch b/patches/server/0743-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0745-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0743-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0746-Reset-placed-block-on-exception.patch b/patches/server/0744-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0746-Reset-placed-block-on-exception.patch rename to patches/server/0744-Reset-placed-block-on-exception.patch diff --git a/patches/server/0747-Add-configurable-height-for-slime-spawn.patch b/patches/server/0745-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0747-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0745-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0748-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0746-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0748-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0746-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0749-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0747-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0749-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0747-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0750-Kick-on-main-for-illegal-chat.patch b/patches/server/0748-Kick-on-main-for-illegal-chat.patch similarity index 100% rename from patches/server/0750-Kick-on-main-for-illegal-chat.patch rename to patches/server/0748-Kick-on-main-for-illegal-chat.patch diff --git a/patches/server/0751-Multi-Block-Change-API-Implementation.patch b/patches/server/0749-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0751-Multi-Block-Change-API-Implementation.patch rename to patches/server/0749-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0752-Fix-NotePlayEvent.patch b/patches/server/0750-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0752-Fix-NotePlayEvent.patch rename to patches/server/0750-Fix-NotePlayEvent.patch diff --git a/patches/server/0753-Freeze-Tick-Lock-API.patch b/patches/server/0751-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0753-Freeze-Tick-Lock-API.patch rename to patches/server/0751-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0754-Dolphin-API.patch b/patches/server/0752-Dolphin-API.patch similarity index 100% rename from patches/server/0754-Dolphin-API.patch rename to patches/server/0752-Dolphin-API.patch diff --git a/patches/server/0755-More-PotionEffectType-API.patch b/patches/server/0753-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0755-More-PotionEffectType-API.patch rename to patches/server/0753-More-PotionEffectType-API.patch diff --git a/patches/server/0756-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0754-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0756-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0754-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0757-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0755-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0757-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0755-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0758-Add-missing-structure-set-seed-configs.patch b/patches/server/0756-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0758-Add-missing-structure-set-seed-configs.patch rename to patches/server/0756-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0759-Implement-regenerateChunk.patch b/patches/server/0757-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0759-Implement-regenerateChunk.patch rename to patches/server/0757-Implement-regenerateChunk.patch diff --git a/patches/server/0760-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0758-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0760-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0758-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0761-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0759-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0761-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0759-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0762-Add-GameEvent-tags.patch b/patches/server/0760-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0762-Add-GameEvent-tags.patch rename to patches/server/0760-Add-GameEvent-tags.patch diff --git a/patches/server/0763-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0761-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0763-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0761-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0764-Furnace-RecipesUsed-API.patch b/patches/server/0762-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0764-Furnace-RecipesUsed-API.patch rename to patches/server/0762-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0765-Configurable-sculk-sensor-listener-range.patch b/patches/server/0763-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0765-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0763-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0766-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0764-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0766-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0764-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0767-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0765-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0767-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0765-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0768-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0766-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0768-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0766-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0769-Fix-Entity-Position-Desync.patch b/patches/server/0767-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0769-Fix-Entity-Position-Desync.patch rename to patches/server/0767-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0770-Custom-Potion-Mixes.patch b/patches/server/0768-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0770-Custom-Potion-Mixes.patch rename to patches/server/0768-Custom-Potion-Mixes.patch diff --git a/patches/server/0771-Force-close-world-loading-screen.patch b/patches/server/0769-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0771-Force-close-world-loading-screen.patch rename to patches/server/0769-Force-close-world-loading-screen.patch diff --git a/patches/server/0772-Fix-falling-block-spawn-methods.patch b/patches/server/0770-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0772-Fix-falling-block-spawn-methods.patch rename to patches/server/0770-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0773-Expose-furnace-minecart-push-values.patch b/patches/server/0771-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0773-Expose-furnace-minecart-push-values.patch rename to patches/server/0771-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0774-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0772-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0774-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0772-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0775-More-Projectile-API.patch b/patches/server/0773-More-Projectile-API.patch similarity index 99% rename from patches/server/0775-More-Projectile-API.patch rename to patches/server/0773-More-Projectile-API.patch index 8c483dc3a1..11712124a5 100644 --- a/patches/server/0775-More-Projectile-API.patch +++ b/patches/server/0773-More-Projectile-API.patch @@ -560,10 +560,10 @@ index cc679e7042c5a5fba2ce34598f2c1eaf49bb065f..58dbb94f101103249028987eda7004c6 } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 93a9d53c29d9b359d9d8618254085b7fcebe8cdf..4dd17b98239edcd7cefd3533a40152e2348e747a 100644 +index 1cd7a7ab18dca87090e7aba9c0683f937fdb6188..a919202adae326294f2598fbe76a5c3f8408a68c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -@@ -300,12 +300,20 @@ public final class CraftItemStack extends ItemStack { +@@ -289,12 +289,20 @@ public final class CraftItemStack extends ItemStack { public ItemMeta getItemMeta() { return CraftItemStack.getItemMeta(this.handle); } diff --git a/patches/server/0776-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0774-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0776-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0774-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0777-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0775-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0777-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0775-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0778-Implement-getComputedBiome-API.patch b/patches/server/0776-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0778-Implement-getComputedBiome-API.patch rename to patches/server/0776-Implement-getComputedBiome-API.patch diff --git a/patches/server/0779-Make-some-itemstacks-nonnull.patch b/patches/server/0777-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0779-Make-some-itemstacks-nonnull.patch rename to patches/server/0777-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0780-Implement-enchantWithLevels-API.patch b/patches/server/0778-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0780-Implement-enchantWithLevels-API.patch rename to patches/server/0778-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0781-Fix-saving-in-unloadWorld.patch b/patches/server/0779-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0781-Fix-saving-in-unloadWorld.patch rename to patches/server/0779-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0782-Buffer-OOB-setBlock-calls.patch b/patches/server/0780-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0782-Buffer-OOB-setBlock-calls.patch rename to patches/server/0780-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0783-Add-TameableDeathMessageEvent.patch b/patches/server/0781-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0783-Add-TameableDeathMessageEvent.patch rename to patches/server/0781-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0784-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0782-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0784-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0782-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0785-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0783-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0785-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0783-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0786-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0784-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0786-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0784-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0787-Guard-against-invalid-entity-positions.patch b/patches/server/0785-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0787-Guard-against-invalid-entity-positions.patch rename to patches/server/0785-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0788-cache-resource-keys.patch b/patches/server/0786-cache-resource-keys.patch similarity index 100% rename from patches/server/0788-cache-resource-keys.patch rename to patches/server/0786-cache-resource-keys.patch diff --git a/patches/server/0789-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0787-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0789-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0787-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0790-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0788-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0790-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0788-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0791-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0789-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0791-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0789-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0792-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0790-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0792-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0790-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0793-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0791-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0793-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0791-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0794-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0792-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 100% rename from patches/server/0794-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0792-Pass-ServerLevel-for-gamerule-callbacks.patch diff --git a/patches/server/0795-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0793-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0795-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0793-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0796-WorldCreator-keepSpawnLoaded.patch b/patches/server/0794-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0796-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0794-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0797-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0795-Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/server/0797-Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/server/0795-Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/server/0798-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0796-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0798-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0796-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0799-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0797-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0799-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0797-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0800-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0798-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0800-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0798-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0801-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0799-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0801-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0799-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0802-Add-PlayerStopUsingItemEvent.patch b/patches/server/0800-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0802-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0800-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0803-Don-t-tick-markers.patch b/patches/server/0801-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0803-Don-t-tick-markers.patch rename to patches/server/0801-Don-t-tick-markers.patch diff --git a/patches/server/0804-Expand-FallingBlock-API.patch b/patches/server/0802-Expand-FallingBlock-API.patch similarity index 100% rename from patches/server/0804-Expand-FallingBlock-API.patch rename to patches/server/0802-Expand-FallingBlock-API.patch diff --git a/patches/server/0805-Do-not-accept-invalid-client-settings.patch b/patches/server/0803-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0805-Do-not-accept-invalid-client-settings.patch rename to patches/server/0803-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0806-Add-support-for-Proxy-Protocol.patch b/patches/server/0804-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0806-Add-support-for-Proxy-Protocol.patch rename to patches/server/0804-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0807-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0805-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0807-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0805-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0808-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0806-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0808-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0806-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0809-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0807-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0809-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0807-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0810-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0808-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0810-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0808-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0811-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0809-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0811-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0809-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0812-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0810-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0812-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0810-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0813-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0811-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0813-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0811-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0814-Dont-resent-entity-on-art-update.patch b/patches/server/0812-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0814-Dont-resent-entity-on-art-update.patch rename to patches/server/0812-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0815-Add-WardenAngerChangeEvent.patch b/patches/server/0813-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0815-Add-WardenAngerChangeEvent.patch rename to patches/server/0813-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0816-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0814-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0816-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0814-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0817-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0815-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0817-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0815-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0818-Nameable-Banner-API.patch b/patches/server/0816-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0818-Nameable-Banner-API.patch rename to patches/server/0816-Nameable-Banner-API.patch diff --git a/patches/server/0819-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0817-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0819-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0817-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0820-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0818-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0820-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0818-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0821-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0819-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0821-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0819-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0822-Add-Player-getFishHook.patch b/patches/server/0820-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0822-Add-Player-getFishHook.patch rename to patches/server/0820-Add-Player-getFishHook.patch diff --git a/patches/server/0823-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0821-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0823-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0821-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0824-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0822-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0824-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0822-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0825-Fix-Bee-flower-NPE.patch b/patches/server/0823-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0825-Fix-Bee-flower-NPE.patch rename to patches/server/0823-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0826-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0824-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0826-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0824-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0827-More-Teleport-API.patch b/patches/server/0825-More-Teleport-API.patch similarity index 100% rename from patches/server/0827-More-Teleport-API.patch rename to patches/server/0825-More-Teleport-API.patch diff --git a/patches/server/0828-Add-EntityPortalReadyEvent.patch b/patches/server/0826-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0828-Add-EntityPortalReadyEvent.patch rename to patches/server/0826-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0829-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0827-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0829-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0827-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0830-Send-block-entities-after-destroy-prediction.patch b/patches/server/0828-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0830-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0828-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0831-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0829-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0831-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0829-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0832-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0830-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0832-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0830-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0833-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0831-Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0833-Add-and-fix-missing-BlockFadeEvents.patch rename to patches/server/0831-Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/server/0834-Collision-API.patch b/patches/server/0832-Collision-API.patch similarity index 100% rename from patches/server/0834-Collision-API.patch rename to patches/server/0832-Collision-API.patch diff --git a/patches/server/0835-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0833-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0835-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0833-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0836-Block-Ticking-API.patch b/patches/server/0834-Block-Ticking-API.patch similarity index 100% rename from patches/server/0836-Block-Ticking-API.patch rename to patches/server/0834-Block-Ticking-API.patch diff --git a/patches/server/0837-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0835-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0837-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0835-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0838-Add-NamespacedKey-biome-methods.patch b/patches/server/0836-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0838-Add-NamespacedKey-biome-methods.patch rename to patches/server/0836-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0839-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0837-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0839-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0837-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0840-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0838-Stop-large-look-changes-from-crashing-the-server.patch similarity index 94% rename from patches/server/0840-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0838-Stop-large-look-changes-from-crashing-the-server.patch index 8d84d2fdb3..128f6b1226 100644 --- a/patches/server/0840-Stop-large-look-changes-from-crashing-the-server.patch +++ b/patches/server/0838-Stop-large-look-changes-from-crashing-the-server.patch @@ -54,10 +54,10 @@ index a21de30eef397308e3f4866a16cc588012e16f50..ece2f45427462587e28ba770178e13d7 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 621cb07c02cf318bf1b72c14724a42e0987d5b2f..5d779e75a1516487c53d96744613f292b0ccd1f7 100644 +index 444119c813af920eb25706341106f0fea27befa8..270dd1db56b187bffaedba9f2b86b3e46dda3152 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -@@ -271,13 +271,7 @@ public abstract class Projectile extends Entity implements TraceableEntity { +@@ -259,13 +259,7 @@ public abstract class Projectile extends Entity implements TraceableEntity { } protected static float lerpRotation(float prevRot, float newRot) { diff --git a/patches/server/0841-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0839-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0841-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0839-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0842-Missing-eating-regain-reason.patch b/patches/server/0840-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0842-Missing-eating-regain-reason.patch rename to patches/server/0840-Missing-eating-regain-reason.patch diff --git a/patches/server/0843-Missing-effect-cause.patch b/patches/server/0841-Missing-effect-cause.patch similarity index 100% rename from patches/server/0843-Missing-effect-cause.patch rename to patches/server/0841-Missing-effect-cause.patch diff --git a/patches/server/0844-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0842-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0844-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0842-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0845-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0843-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0845-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0843-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0846-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0844-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0846-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0844-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0847-Configurable-chat-thread-limit.patch b/patches/server/0845-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0847-Configurable-chat-thread-limit.patch rename to patches/server/0845-Configurable-chat-thread-limit.patch diff --git a/patches/server/0848-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0846-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0848-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0846-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0849-fix-Jigsaw-block-kicking-user.patch b/patches/server/0847-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0849-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0847-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0850-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0848-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0850-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0848-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0851-Add-getDrops-to-BlockState.patch b/patches/server/0849-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0851-Add-getDrops-to-BlockState.patch rename to patches/server/0849-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0852-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0850-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0852-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0850-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0853-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0851-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0853-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0851-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0854-Fix-custom-piglin-loved-items.patch b/patches/server/0852-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0854-Fix-custom-piglin-loved-items.patch rename to patches/server/0852-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0855-EntityPickupItemEvent-fixes.patch b/patches/server/0853-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0855-EntityPickupItemEvent-fixes.patch rename to patches/server/0853-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0856-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0854-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0856-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0854-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0857-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0855-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0857-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0855-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0858-Elder-Guardian-appearance-API.patch b/patches/server/0856-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0858-Elder-Guardian-appearance-API.patch rename to patches/server/0856-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0859-Allow-changing-bed-s-occupied-property.patch b/patches/server/0857-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0859-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0857-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0860-Add-entity-knockback-API.patch b/patches/server/0858-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0860-Add-entity-knockback-API.patch rename to patches/server/0858-Add-entity-knockback-API.patch diff --git a/patches/server/0861-Detect-headless-JREs.patch b/patches/server/0859-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0861-Detect-headless-JREs.patch rename to patches/server/0859-Detect-headless-JREs.patch diff --git a/patches/server/0862-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0860-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0862-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0860-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0863-optimized-dirt-and-snow-spreading.patch b/patches/server/0861-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0863-optimized-dirt-and-snow-spreading.patch rename to patches/server/0861-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0864-Added-EntityToggleSitEvent.patch b/patches/server/0862-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0864-Added-EntityToggleSitEvent.patch rename to patches/server/0862-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0865-Add-fire-tick-delay-option.patch b/patches/server/0863-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0865-Add-fire-tick-delay-option.patch rename to patches/server/0863-Add-fire-tick-delay-option.patch diff --git a/patches/server/0866-Add-Moving-Piston-API.patch b/patches/server/0864-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0866-Add-Moving-Piston-API.patch rename to patches/server/0864-Add-Moving-Piston-API.patch diff --git a/patches/server/0867-Ignore-impossible-spawn-tick.patch b/patches/server/0865-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0867-Ignore-impossible-spawn-tick.patch rename to patches/server/0865-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0868-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0866-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0868-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0866-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0869-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0867-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0869-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0867-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0870-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0868-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0870-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0868-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0871-Prevent-compass-from-loading-chunks.patch b/patches/server/0869-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0871-Prevent-compass-from-loading-chunks.patch rename to patches/server/0869-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0872-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0870-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0872-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0870-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0873-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0871-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0873-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0871-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0874-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0872-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0874-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0872-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0875-Add-Player-Warden-Warning-API.patch b/patches/server/0873-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0875-Add-Player-Warden-Warning-API.patch rename to patches/server/0873-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0876-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0874-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0876-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0874-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0877-Add-paper-dumplisteners-command.patch b/patches/server/0875-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0877-Add-paper-dumplisteners-command.patch rename to patches/server/0875-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0878-check-global-player-list-where-appropriate.patch b/patches/server/0876-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0878-check-global-player-list-where-appropriate.patch rename to patches/server/0876-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0879-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0877-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0879-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0877-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0880-ItemStack-damage-API.patch b/patches/server/0878-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0880-ItemStack-damage-API.patch rename to patches/server/0878-ItemStack-damage-API.patch diff --git a/patches/server/0881-Friction-API.patch b/patches/server/0879-Friction-API.patch similarity index 100% rename from patches/server/0881-Friction-API.patch rename to patches/server/0879-Friction-API.patch diff --git a/patches/server/0882-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0880-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0882-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0880-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0883-Fix-player-kick-on-shutdown.patch b/patches/server/0881-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0883-Fix-player-kick-on-shutdown.patch rename to patches/server/0881-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0884-Sync-offhand-slot-in-menus.patch b/patches/server/0882-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0884-Sync-offhand-slot-in-menus.patch rename to patches/server/0882-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0885-Player-Entity-Tracking-Events.patch b/patches/server/0883-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0885-Player-Entity-Tracking-Events.patch rename to patches/server/0883-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0886-Limit-pet-look-distance.patch b/patches/server/0884-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0886-Limit-pet-look-distance.patch rename to patches/server/0884-Limit-pet-look-distance.patch diff --git a/patches/server/0887-Properly-resend-entities.patch b/patches/server/0885-Properly-resend-entities.patch similarity index 100% rename from patches/server/0887-Properly-resend-entities.patch rename to patches/server/0885-Properly-resend-entities.patch diff --git a/patches/server/0888-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0886-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0888-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0886-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0889-fix-Instruments.patch b/patches/server/0887-fix-Instruments.patch similarity index 100% rename from patches/server/0889-fix-Instruments.patch rename to patches/server/0887-fix-Instruments.patch diff --git a/patches/server/0890-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0888-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0890-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0888-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0891-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0889-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0891-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0889-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0892-Add-BlockLockCheckEvent.patch b/patches/server/0890-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0892-Add-BlockLockCheckEvent.patch rename to patches/server/0890-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0893-Add-Sneaking-API-for-Entities.patch b/patches/server/0891-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0893-Add-Sneaking-API-for-Entities.patch rename to patches/server/0891-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0894-Improve-logging-and-errors.patch b/patches/server/0892-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0894-Improve-logging-and-errors.patch rename to patches/server/0892-Improve-logging-and-errors.patch diff --git a/patches/server/0895-Improve-PortalEvents.patch b/patches/server/0893-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0895-Improve-PortalEvents.patch rename to patches/server/0893-Improve-PortalEvents.patch diff --git a/patches/server/0896-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0894-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0896-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0894-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0897-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0895-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0897-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0895-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0898-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0896-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0898-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0896-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0899-Flying-Fall-Damage.patch b/patches/server/0897-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0899-Flying-Fall-Damage.patch rename to patches/server/0897-Flying-Fall-Damage.patch diff --git a/patches/server/0900-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0898-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/server/0900-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/server/0898-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/server/0901-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0899-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0901-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0899-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0902-config-for-disabling-entity-tag-tags.patch b/patches/server/0900-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0902-config-for-disabling-entity-tag-tags.patch rename to patches/server/0900-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0903-Use-single-player-info-update-packet-on-join.patch b/patches/server/0901-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0903-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0901-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0904-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0902-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0904-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0902-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0905-Win-Screen-API.patch b/patches/server/0903-Win-Screen-API.patch similarity index 100% rename from patches/server/0905-Win-Screen-API.patch rename to patches/server/0903-Win-Screen-API.patch diff --git a/patches/server/0906-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0904-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 93% rename from patches/server/0906-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0904-Remove-CraftItemStack-setAmount-null-assignment.patch index 57ac3fc4a3..16e1714cdd 100644 --- a/patches/server/0906-Remove-CraftItemStack-setAmount-null-assignment.patch +++ b/patches/server/0904-Remove-CraftItemStack-setAmount-null-assignment.patch @@ -16,7 +16,7 @@ with less than zero amounts, so this code doesn't create a problem with operations on the vanilla ItemStack. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 4dd17b98239edcd7cefd3533a40152e2348e747a..220ccd03d6f326b3747602e0e4e7ffee8173dc03 100644 +index a919202adae326294f2598fbe76a5c3f8408a68c..0461eb3afcb7953bfe2c912c477227186689a2ac 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -157,7 +157,7 @@ public final class CraftItemStack extends ItemStack { diff --git a/patches/server/0907-Fix-force-opening-enchantment-tables.patch b/patches/server/0905-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0907-Fix-force-opening-enchantment-tables.patch rename to patches/server/0905-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0908-Add-Entity-Body-Yaw-API.patch b/patches/server/0906-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0908-Add-Entity-Body-Yaw-API.patch rename to patches/server/0906-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0909-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0907-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0909-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0907-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0910-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0908-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0910-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0908-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0911-Add-EntityFertilizeEggEvent.patch b/patches/server/0909-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0911-Add-EntityFertilizeEggEvent.patch rename to patches/server/0909-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0912-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0910-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0912-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0910-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0913-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0911-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0913-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0911-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0914-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0912-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0914-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0912-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0915-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0913-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0915-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0913-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0916-Fix-text-display-error-on-spawn.patch b/patches/server/0914-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0916-Fix-text-display-error-on-spawn.patch rename to patches/server/0914-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0917-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0915-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0917-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0915-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0918-Add-Shearable-API.patch b/patches/server/0916-Add-Shearable-API.patch similarity index 100% rename from patches/server/0918-Add-Shearable-API.patch rename to patches/server/0916-Add-Shearable-API.patch diff --git a/patches/server/0919-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0917-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0919-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0917-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0920-Optimize-Hoppers.patch b/patches/server/0918-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0920-Optimize-Hoppers.patch rename to patches/server/0918-Optimize-Hoppers.patch diff --git a/patches/server/0921-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0919-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0921-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0919-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0922-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0920-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0922-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0920-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0923-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0921-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0923-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0921-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0924-remove-duplicate-animate-packet-for-records.patch b/patches/server/0922-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0924-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0922-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0925-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0923-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0925-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0923-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0926-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0926-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0924-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0927-Use-array-for-gamerule-storage.patch b/patches/server/0925-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0927-Use-array-for-gamerule-storage.patch rename to patches/server/0925-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0928-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0926-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0928-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0926-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0929-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0927-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0929-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0927-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0930-Add-Mob-Experience-reward-API.patch b/patches/server/0928-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0930-Add-Mob-Experience-reward-API.patch rename to patches/server/0928-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0931-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0929-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0931-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0929-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0932-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0930-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0932-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0930-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0933-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0931-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0933-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0931-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0934-More-accurate-isInOpenWater-impl.patch b/patches/server/0932-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0934-More-accurate-isInOpenWater-impl.patch rename to patches/server/0932-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0935-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0933-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0935-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0933-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0936-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0934-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0936-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0934-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0937-Expand-PlayerItemMendEvent.patch b/patches/server/0935-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0937-Expand-PlayerItemMendEvent.patch rename to patches/server/0935-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0938-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0936-Refresh-ProjectileSource-for-projectiles.patch similarity index 92% rename from patches/server/0938-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0936-Refresh-ProjectileSource-for-projectiles.patch index 5bb2761eba..aecbbce494 100644 --- a/patches/server/0938-Refresh-ProjectileSource-for-projectiles.patch +++ b/patches/server/0936-Refresh-ProjectileSource-for-projectiles.patch @@ -26,7 +26,7 @@ index dad8faf21093f351bd4d66b99ab16caf8bda608f..ed91a1d8877f8d2b2be26389f10d5323 public boolean lastDamageCancelled; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled public boolean persistentInvisibility = false; 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 5d779e75a1516487c53d96744613f292b0ccd1f7..1502bc8fe938de7e69530610e5cc6c265f7e97a1 100644 +index 270dd1db56b187bffaedba9f2b86b3e46dda3152..2f058cec80c6ef7a5a5ca065dc6c9fe353c521de 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java @@ -50,14 +50,31 @@ public abstract class Projectile extends Entity implements TraceableEntity { @@ -63,10 +63,10 @@ index 5d779e75a1516487c53d96744613f292b0ccd1f7..1502bc8fe938de7e69530610e5cc6c26 return this.cachedOwner; } else { if (this.ownerUUID != null) { -@@ -79,6 +96,7 @@ public abstract class Projectile extends Entity implements TraceableEntity { - } - } - // Paper end +@@ -67,6 +84,7 @@ public abstract class Projectile extends Entity implements TraceableEntity { + ServerLevel worldserver = (ServerLevel) world; + + this.cachedOwner = worldserver.getEntity(this.ownerUUID); + this.refreshProjectileSource(false); // Paper return this.cachedOwner; } diff --git a/patches/server/0939-Add-transient-modifier-API.patch b/patches/server/0937-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0939-Add-transient-modifier-API.patch rename to patches/server/0937-Add-transient-modifier-API.patch diff --git a/patches/server/0940-Fix-block-place-logic.patch b/patches/server/0938-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0940-Fix-block-place-logic.patch rename to patches/server/0938-Fix-block-place-logic.patch diff --git a/patches/server/0941-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0939-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0941-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0939-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0942-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0940-Ignore-inline-definitions-of-trim-material-pattern.patch similarity index 100% rename from patches/server/0942-Ignore-inline-definitions-of-trim-material-pattern.patch rename to patches/server/0940-Ignore-inline-definitions-of-trim-material-pattern.patch diff --git a/patches/server/0943-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0941-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0943-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0941-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0944-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0942-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0944-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0942-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0945-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0943-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0945-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0943-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0946-Fix-sniffer-removeExploredLocation.patch b/patches/server/0944-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0946-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0944-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0947-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0945-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/server/0947-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0945-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/server/0948-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0946-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch similarity index 100% rename from patches/server/0948-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch rename to patches/server/0946-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch diff --git a/patches/server/0949-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0947-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0949-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0947-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0950-Properly-Cancel-Usable-Items.patch b/patches/server/0948-Properly-Cancel-Usable-Items.patch similarity index 100% rename from patches/server/0950-Properly-Cancel-Usable-Items.patch rename to patches/server/0948-Properly-Cancel-Usable-Items.patch diff --git a/patches/server/0951-Add-event-for-player-editing-sign.patch b/patches/server/0949-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0951-Add-event-for-player-editing-sign.patch rename to patches/server/0949-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0952-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0950-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0952-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0950-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0953-Improve-command-function-perm-level-checks.patch b/patches/server/0951-Improve-command-function-perm-level-checks.patch similarity index 100% rename from patches/server/0953-Improve-command-function-perm-level-checks.patch rename to patches/server/0951-Improve-command-function-perm-level-checks.patch diff --git a/patches/server/0954-Add-option-to-disable-block-updates.patch b/patches/server/0952-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0954-Add-option-to-disable-block-updates.patch rename to patches/server/0952-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0955-Call-missing-BlockDispenseEvent.patch b/patches/server/0953-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0955-Call-missing-BlockDispenseEvent.patch rename to patches/server/0953-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0956-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0954-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 100% rename from patches/server/0956-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0954-Don-t-load-chunks-for-supporting-block-checks.patch diff --git a/patches/server/0957-Optimize-player-lookups-for-beacons.patch b/patches/server/0955-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0957-Optimize-player-lookups-for-beacons.patch rename to patches/server/0955-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0958-Add-Sign-getInteractableSideFor.patch b/patches/server/0956-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/server/0958-Add-Sign-getInteractableSideFor.patch rename to patches/server/0956-Add-Sign-getInteractableSideFor.patch diff --git a/patches/server/0959-Array-backed-synched-entity-data.patch b/patches/server/0957-Array-backed-synched-entity-data.patch similarity index 100% rename from patches/server/0959-Array-backed-synched-entity-data.patch rename to patches/server/0957-Array-backed-synched-entity-data.patch diff --git a/patches/server/0960-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0958-fix-item-meta-for-tadpole-buckets.patch similarity index 96% rename from patches/server/0960-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0958-fix-item-meta-for-tadpole-buckets.patch index 0680b00a7e..03e7044089 100644 --- a/patches/server/0960-fix-item-meta-for-tadpole-buckets.patch +++ b/patches/server/0958-fix-item-meta-for-tadpole-buckets.patch @@ -17,10 +17,10 @@ index 5f6b93be9e81df8fae9a5ab160a232b65ce7b8bc..c77634ec9c4e7a9eaacc81de7f95e945 case GLOW_ITEM_FRAME: case PAINTING: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 220ccd03d6f326b3747602e0e4e7ffee8173dc03..3660ad55cc7e1f6e571887aac9c0215803f1ce41 100644 +index 0461eb3afcb7953bfe2c912c477227186689a2ac..b05a5c8a4a4136d30e1c93015f79d753fe1a2ace 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -@@ -603,6 +603,7 @@ public final class CraftItemStack extends ItemStack { +@@ -592,6 +592,7 @@ public final class CraftItemStack extends ItemStack { case COD_BUCKET: case PUFFERFISH_BUCKET: case SALMON_BUCKET: diff --git a/patches/server/0961-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0959-Suppress-Item-Meta-Validation-Checks.patch similarity index 100% rename from patches/server/0961-Suppress-Item-Meta-Validation-Checks.patch rename to patches/server/0959-Suppress-Item-Meta-Validation-Checks.patch diff --git a/patches/server/0962-Fix-BanList-API.patch b/patches/server/0960-Fix-BanList-API.patch similarity index 100% rename from patches/server/0962-Fix-BanList-API.patch rename to patches/server/0960-Fix-BanList-API.patch diff --git a/patches/server/0963-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0961-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0963-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0961-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0964-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0962-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0964-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0962-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0965-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0963-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0965-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0963-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0966-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0964-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/server/0966-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0964-ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/server/0967-Don-t-tick-signs.patch b/patches/server/0965-Don-t-tick-signs.patch similarity index 100% rename from patches/server/0967-Don-t-tick-signs.patch rename to patches/server/0965-Don-t-tick-signs.patch diff --git a/patches/server/0968-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0966-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0968-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0966-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0969-Add-whitelist-events.patch b/patches/server/0967-Add-whitelist-events.patch similarity index 100% rename from patches/server/0969-Add-whitelist-events.patch rename to patches/server/0967-Add-whitelist-events.patch diff --git a/patches/server/0970-Implement-PlayerFailMoveEvent.patch b/patches/server/0968-Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/server/0970-Implement-PlayerFailMoveEvent.patch rename to patches/server/0968-Implement-PlayerFailMoveEvent.patch diff --git a/patches/server/0971-Folia-scheduler-and-owned-region-API.patch b/patches/server/0969-Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/server/0971-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0969-Folia-scheduler-and-owned-region-API.patch diff --git a/patches/server/0972-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0970-Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/server/0972-Only-erase-allay-memory-on-non-item-targets.patch rename to patches/server/0970-Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/server/0973-API-for-updating-recipes-on-clients.patch b/patches/server/0971-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/server/0973-API-for-updating-recipes-on-clients.patch rename to patches/server/0971-API-for-updating-recipes-on-clients.patch diff --git a/patches/server/0974-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0972-Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/server/0974-Fix-rotation-when-spawning-display-entities.patch rename to patches/server/0972-Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/server/0975-Only-capture-actual-tree-growth.patch b/patches/server/0973-Only-capture-actual-tree-growth.patch similarity index 100% rename from patches/server/0975-Only-capture-actual-tree-growth.patch rename to patches/server/0973-Only-capture-actual-tree-growth.patch diff --git a/patches/server/0976-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0974-Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/server/0976-Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/server/0974-Use-correct-source-for-mushroom-block-spread-event.patch diff --git a/patches/server/0977-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0975-Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/server/0977-Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/server/0975-Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/server/0978-Use-correct-seed-on-api-world-load.patch b/patches/server/0976-Use-correct-seed-on-api-world-load.patch similarity index 100% rename from patches/server/0978-Use-correct-seed-on-api-world-load.patch rename to patches/server/0976-Use-correct-seed-on-api-world-load.patch diff --git a/patches/server/0979-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0977-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0979-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/0977-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0980-Cache-map-ids-on-item-frames.patch b/patches/server/0978-Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/server/0980-Cache-map-ids-on-item-frames.patch rename to patches/server/0978-Cache-map-ids-on-item-frames.patch diff --git a/patches/server/0981-Fix-custom-statistic-criteria-creation.patch b/patches/server/0979-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/server/0981-Fix-custom-statistic-criteria-creation.patch rename to patches/server/0979-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/server/0982-Bandaid-fix-for-Effect.patch b/patches/server/0980-Bandaid-fix-for-Effect.patch similarity index 100% rename from patches/server/0982-Bandaid-fix-for-Effect.patch rename to patches/server/0980-Bandaid-fix-for-Effect.patch diff --git a/patches/server/0983-SculkCatalyst-bloom-API.patch b/patches/server/0981-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0983-SculkCatalyst-bloom-API.patch rename to patches/server/0981-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0984-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0982-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/server/0984-API-for-an-entity-s-scoreboard-name.patch rename to patches/server/0982-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/server/0985-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0983-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 100% rename from patches/server/0985-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/0983-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch diff --git a/patches/server/0986-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0984-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/server/0986-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/0984-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/server/0987-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0985-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/server/0987-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/0985-Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/server/0988-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0986-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/server/0988-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/0986-Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/server/0989-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0987-Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/server/0989-Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/0987-Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/server/0990-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0988-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/server/0990-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/0988-Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/server/0991-Add-Listing-API-for-Player.patch b/patches/server/0989-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/server/0991-Add-Listing-API-for-Player.patch rename to patches/server/0989-Add-Listing-API-for-Player.patch diff --git a/patches/server/0992-Configurable-Region-Compression-Format.patch b/patches/server/0990-Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/server/0992-Configurable-Region-Compression-Format.patch rename to patches/server/0990-Configurable-Region-Compression-Format.patch diff --git a/patches/server/0993-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0991-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/server/0993-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/server/0991-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/server/0994-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0992-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/0994-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/0992-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/0995-Expand-Pose-API.patch b/patches/server/0993-Expand-Pose-API.patch similarity index 100% rename from patches/server/0995-Expand-Pose-API.patch rename to patches/server/0993-Expand-Pose-API.patch diff --git a/patches/server/0996-More-DragonBattle-API.patch b/patches/server/0994-More-DragonBattle-API.patch similarity index 100% rename from patches/server/0996-More-DragonBattle-API.patch rename to patches/server/0994-More-DragonBattle-API.patch diff --git a/patches/server/0997-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0995-Deep-clone-unhandled-nbt-tags.patch similarity index 100% rename from patches/server/0997-Deep-clone-unhandled-nbt-tags.patch rename to patches/server/0995-Deep-clone-unhandled-nbt-tags.patch diff --git a/patches/server/0998-Add-PlayerPickItemEvent.patch b/patches/server/0996-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/server/0998-Add-PlayerPickItemEvent.patch rename to patches/server/0996-Add-PlayerPickItemEvent.patch diff --git a/patches/server/0999-Improve-performance-of-mass-crafts.patch b/patches/server/0997-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/0999-Improve-performance-of-mass-crafts.patch rename to patches/server/0997-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1000-Allow-trident-custom-damage.patch b/patches/server/0998-Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/1000-Allow-trident-custom-damage.patch rename to patches/server/0998-Allow-trident-custom-damage.patch diff --git a/patches/server/1001-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/0999-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/1001-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/server/0999-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/server/1002-Optimize-nearest-structure-border-iteration.patch b/patches/server/1000-Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/1002-Optimize-nearest-structure-border-iteration.patch rename to patches/server/1000-Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/1003-Implement-OfflinePlayer-isConnected.patch b/patches/server/1001-Implement-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/server/1003-Implement-OfflinePlayer-isConnected.patch rename to patches/server/1001-Implement-OfflinePlayer-isConnected.patch diff --git a/patches/server/1004-Fix-inventory-desync.patch b/patches/server/1002-Fix-inventory-desync.patch similarity index 100% rename from patches/server/1004-Fix-inventory-desync.patch rename to patches/server/1002-Fix-inventory-desync.patch diff --git a/patches/server/1005-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1003-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/server/1005-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/1003-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/server/1006-Configure-sniffer-egg-hatch-time.patch b/patches/server/1004-Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/1006-Configure-sniffer-egg-hatch-time.patch rename to patches/server/1004-Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/1007-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1005-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/server/1007-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/1005-Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/server/1008-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1006-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/1008-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/1006-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/1009-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1007-Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/server/1009-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/1007-Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/server/1010-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1008-Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/server/1010-Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/server/1008-Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/server/1011-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1009-Allow-proper-checking-of-empty-item-stacks.patch similarity index 93% rename from patches/server/1011-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/1009-Allow-proper-checking-of-empty-item-stacks.patch index 98467a90d4..5ff6447887 100644 --- a/patches/server/1011-Allow-proper-checking-of-empty-item-stacks.patch +++ b/patches/server/1009-Allow-proper-checking-of-empty-item-stacks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow proper checking of empty item stacks diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 3660ad55cc7e1f6e571887aac9c0215803f1ce41..f9ae1d0889e7f8ff8753d27619bfeb6e9c23f5fe 100644 +index b05a5c8a4a4136d30e1c93015f79d753fe1a2ace..7722565c5e577c2097c43eb7aaed25c4dce6b7b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -33,12 +33,19 @@ public final class CraftItemStack extends ItemStack { diff --git a/patches/server/1012-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1010-Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/server/1012-Fix-silent-equipment-change-for-mobs.patch rename to patches/server/1010-Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/server/1013-Fix-spigot-s-Forced-Stats.patch b/patches/server/1011-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/1013-Fix-spigot-s-Forced-Stats.patch rename to patches/server/1011-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/1014-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1012-Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/1014-Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/1012-Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/1015-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1013-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/server/1015-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/1013-Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/server/1016-Actually-optimise-explosions.patch b/patches/server/1014-Actually-optimise-explosions.patch similarity index 100% rename from patches/server/1016-Actually-optimise-explosions.patch rename to patches/server/1014-Actually-optimise-explosions.patch diff --git a/patches/server/1017-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1015-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/1017-Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/1015-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/1018-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1016-Remove-Spigot-Bug-Fix-for-MC-109346.patch similarity index 100% rename from patches/server/1018-Remove-Spigot-Bug-Fix-for-MC-109346.patch rename to patches/server/1016-Remove-Spigot-Bug-Fix-for-MC-109346.patch diff --git a/patches/server/1019-Fix-SuspiciousStewMeta.patch b/patches/server/1017-Fix-SuspiciousStewMeta.patch similarity index 100% rename from patches/server/1019-Fix-SuspiciousStewMeta.patch rename to patches/server/1017-Fix-SuspiciousStewMeta.patch diff --git a/patches/server/1020-Optimise-chunk-tick-iteration.patch b/patches/server/1018-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/1020-Optimise-chunk-tick-iteration.patch rename to patches/server/1018-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/1021-Lag-compensation-ticks.patch b/patches/server/1019-Lag-compensation-ticks.patch similarity index 100% rename from patches/server/1021-Lag-compensation-ticks.patch rename to patches/server/1019-Lag-compensation-ticks.patch diff --git a/patches/server/1022-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1020-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/server/1022-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/server/1020-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/server/1023-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1021-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/server/1023-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/server/1021-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/server/1024-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1022-Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 100% rename from patches/server/1024-Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/server/1022-Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/server/1025-Optimise-nearby-player-retrieval.patch b/patches/server/1023-Optimise-nearby-player-retrieval.patch similarity index 100% rename from patches/server/1025-Optimise-nearby-player-retrieval.patch rename to patches/server/1023-Optimise-nearby-player-retrieval.patch diff --git a/patches/server/1026-Remove-streams-for-villager-AI.patch b/patches/server/1024-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/1026-Remove-streams-for-villager-AI.patch rename to patches/server/1024-Remove-streams-for-villager-AI.patch diff --git a/patches/server/1027-Fix-missing-map-initialize-event-call.patch b/patches/server/1025-Fix-missing-map-initialize-event-call.patch similarity index 100% rename from patches/server/1027-Fix-missing-map-initialize-event-call.patch rename to patches/server/1025-Fix-missing-map-initialize-event-call.patch diff --git a/patches/server/1028-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1026-Update-entity-data-when-attaching-firework-to-entity.patch similarity index 100% rename from patches/server/1028-Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/server/1026-Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/server/1029-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1027-Use-correct-variable-for-initializing-CraftLootTable.patch similarity index 100% rename from patches/server/1029-Use-correct-variable-for-initializing-CraftLootTable.patch rename to patches/server/1027-Use-correct-variable-for-initializing-CraftLootTable.patch diff --git a/patches/server/1030-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1028-Make-setVelocity-method-of-Fireballs-change-the-trav.patch similarity index 100% rename from patches/server/1030-Make-setVelocity-method-of-Fireballs-change-the-trav.patch rename to patches/server/1028-Make-setVelocity-method-of-Fireballs-change-the-trav.patch diff --git a/patches/server/1031-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1029-Fix-UnsafeValues-loadAdvancement.patch similarity index 100% rename from patches/server/1031-Fix-UnsafeValues-loadAdvancement.patch rename to patches/server/1029-Fix-UnsafeValues-loadAdvancement.patch diff --git a/patches/server/1032-Add-player-idle-duration-API.patch b/patches/server/1030-Add-player-idle-duration-API.patch similarity index 100% rename from patches/server/1032-Add-player-idle-duration-API.patch rename to patches/server/1030-Add-player-idle-duration-API.patch diff --git a/patches/server/1033-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1031-Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 100% rename from patches/server/1033-Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/server/1031-Don-t-check-if-we-can-see-non-visible-entities.patch diff --git a/patches/server/1034-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1032-Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/1034-Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/server/1032-Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/1035-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1033-Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 100% rename from patches/server/1035-Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/server/1033-Allow-null-itemstack-for-Player-sendEquipmentChange.patch diff --git a/patches/server/1036-Optimize-VarInts.patch b/patches/server/1034-Optimize-VarInts.patch similarity index 100% rename from patches/server/1036-Optimize-VarInts.patch rename to patches/server/1034-Optimize-VarInts.patch diff --git a/patches/server/1037-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/1035-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/server/1037-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/server/1035-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/server/1038-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/1036-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/server/1038-Add-predicate-for-blocks-when-raytracing.patch rename to patches/server/1036-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/server/1039-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/1037-Broadcast-take-item-packets-with-collector-as-source.patch similarity index 100% rename from patches/server/1039-Broadcast-take-item-packets-with-collector-as-source.patch rename to patches/server/1037-Broadcast-take-item-packets-with-collector-as-source.patch diff --git a/patches/server/1040-fix-secure-profile-with-proxy-online-mode.patch b/patches/server/1038-fix-secure-profile-with-proxy-online-mode.patch similarity index 100% rename from patches/server/1040-fix-secure-profile-with-proxy-online-mode.patch rename to patches/server/1038-fix-secure-profile-with-proxy-online-mode.patch diff --git a/patches/server/1041-Expand-LingeringPotion-API.patch b/patches/server/1039-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/server/1041-Expand-LingeringPotion-API.patch rename to patches/server/1039-Expand-LingeringPotion-API.patch diff --git a/patches/server/1042-Add-MaterialTagsTest.patch b/patches/server/1040-Add-MaterialTagsTest.patch similarity index 100% rename from patches/server/1042-Add-MaterialTagsTest.patch rename to patches/server/1040-Add-MaterialTagsTest.patch diff --git a/patches/server/1043-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/1041-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/server/1043-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/server/1041-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/server/1044-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/1042-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/server/1044-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/server/1042-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/server/1045-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/1043-Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/server/1045-Fix-several-issues-with-EntityBreedEvent.patch rename to patches/server/1043-Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/server/1046-Add-UUID-attribute-modifier-API.patch b/patches/server/1044-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/server/1046-Add-UUID-attribute-modifier-API.patch rename to patches/server/1044-Add-UUID-attribute-modifier-API.patch diff --git a/patches/server/1047-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/1045-Fix-missing-event-call-for-entity-teleport-API.patch similarity index 100% rename from patches/server/1047-Fix-missing-event-call-for-entity-teleport-API.patch rename to patches/server/1045-Fix-missing-event-call-for-entity-teleport-API.patch diff --git a/patches/server/1048-Lazily-create-LootContext-for-criterions.patch b/patches/server/1046-Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/server/1048-Lazily-create-LootContext-for-criterions.patch rename to patches/server/1046-Lazily-create-LootContext-for-criterions.patch diff --git a/patches/server/1049-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch b/patches/server/1047-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch similarity index 100% rename from patches/server/1049-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch rename to patches/server/1047-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch diff --git a/patches/server/1050-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/1048-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 100% rename from patches/server/1050-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/server/1048-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch diff --git a/patches/server/1051-Restore-vanilla-entity-drops-behavior.patch b/patches/server/1049-Restore-vanilla-entity-drops-behavior.patch similarity index 100% rename from patches/server/1051-Restore-vanilla-entity-drops-behavior.patch rename to patches/server/1049-Restore-vanilla-entity-drops-behavior.patch diff --git a/patches/server/1052-Add-Structure-check-API.patch b/patches/server/1050-Add-Structure-check-API.patch similarity index 100% rename from patches/server/1052-Add-Structure-check-API.patch rename to patches/server/1050-Add-Structure-check-API.patch diff --git a/patches/server/1053-Dont-resend-blocks-on-interactions.patch b/patches/server/1051-Dont-resend-blocks-on-interactions.patch similarity index 100% rename from patches/server/1053-Dont-resend-blocks-on-interactions.patch rename to patches/server/1051-Dont-resend-blocks-on-interactions.patch