diff --git a/patches/api/0154-PreSpawnerSpawnEvent.patch b/patches/api/0155-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/api/0154-PreSpawnerSpawnEvent.patch rename to patches/api/0155-PreSpawnerSpawnEvent.patch diff --git a/patches/api/0155-Add-Material-Tags.patch b/patches/api/0156-Add-Material-Tags.patch similarity index 100% rename from patches/api/0155-Add-Material-Tags.patch rename to patches/api/0156-Add-Material-Tags.patch diff --git a/patches/api/0156-Add-LivingEntity-getTargetEntity.patch b/patches/api/0157-Add-LivingEntity-getTargetEntity.patch similarity index 97% rename from patches/api/0156-Add-LivingEntity-getTargetEntity.patch rename to patches/api/0157-Add-LivingEntity-getTargetEntity.patch index 43c223a63..5ec536bee 100644 --- a/patches/api/0156-Add-LivingEntity-getTargetEntity.patch +++ b/patches/api/0157-Add-LivingEntity-getTargetEntity.patch @@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..f52644fab1522bdf83ff4f489e9805b2 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 05992ade1bca42a6233373b44513b89986d89c5a..ac6921093457cee6d01fd27690c8bb6034b4af53 100644 +index ad885a0775b387e3e8ca6bfae80c18465038056c..93d20f67bf856d80226470ae2442d199d3e2f45b 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -151,6 +151,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0157-Add-sun-related-API.patch b/patches/api/0158-Add-sun-related-API.patch similarity index 100% rename from patches/api/0157-Add-sun-related-API.patch rename to patches/api/0158-Add-sun-related-API.patch diff --git a/patches/api/0158-Here-s-Johnny.patch b/patches/api/0159-Here-s-Johnny.patch similarity index 100% rename from patches/api/0158-Here-s-Johnny.patch rename to patches/api/0159-Here-s-Johnny.patch diff --git a/patches/api/0159-Turtle-API.patch b/patches/api/0160-Turtle-API.patch similarity index 100% rename from patches/api/0159-Turtle-API.patch rename to patches/api/0160-Turtle-API.patch diff --git a/patches/api/0160-Add-spectator-target-events.patch b/patches/api/0161-Add-spectator-target-events.patch similarity index 100% rename from patches/api/0160-Add-spectator-target-events.patch rename to patches/api/0161-Add-spectator-target-events.patch diff --git a/patches/api/0161-Add-more-Witch-API.patch b/patches/api/0162-Add-more-Witch-API.patch similarity index 100% rename from patches/api/0161-Add-more-Witch-API.patch rename to patches/api/0162-Add-more-Witch-API.patch diff --git a/patches/api/0162-Make-the-default-permission-message-configurable.patch b/patches/api/0163-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/api/0162-Make-the-default-permission-message-configurable.patch rename to patches/api/0163-Make-the-default-permission-message-configurable.patch diff --git a/patches/api/0163-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch similarity index 100% rename from patches/api/0163-Support-cancellation-supression-of-EntityDismount-Ve.patch rename to patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch diff --git a/patches/api/0164-Add-more-Zombie-API.patch b/patches/api/0165-Add-more-Zombie-API.patch similarity index 100% rename from patches/api/0164-Add-more-Zombie-API.patch rename to patches/api/0165-Add-more-Zombie-API.patch diff --git a/patches/api/0165-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch similarity index 100% rename from patches/api/0165-Change-the-reserved-channel-check-to-be-sensible.patch rename to patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch diff --git a/patches/api/0166-Add-PlayerConnectionCloseEvent.patch b/patches/api/0167-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/api/0166-Add-PlayerConnectionCloseEvent.patch rename to patches/api/0167-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/api/0167-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/api/0167-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/api/0168-BlockDestroyEvent.patch b/patches/api/0169-BlockDestroyEvent.patch similarity index 100% rename from patches/api/0168-BlockDestroyEvent.patch rename to patches/api/0169-BlockDestroyEvent.patch diff --git a/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch similarity index 100% rename from patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch rename to patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch diff --git a/patches/api/0170-Add-WhitelistToggleEvent.patch b/patches/api/0171-Add-WhitelistToggleEvent.patch similarity index 100% rename from patches/api/0170-Add-WhitelistToggleEvent.patch rename to patches/api/0171-Add-WhitelistToggleEvent.patch diff --git a/patches/api/0171-Annotation-Test-changes.patch b/patches/api/0172-Annotation-Test-changes.patch similarity index 100% rename from patches/api/0171-Annotation-Test-changes.patch rename to patches/api/0172-Annotation-Test-changes.patch diff --git a/patches/api/0172-Entity-getEntitySpawnReason.patch b/patches/api/0173-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/api/0172-Entity-getEntitySpawnReason.patch rename to patches/api/0173-Entity-getEntitySpawnReason.patch diff --git a/patches/api/0173-Add-GS4-Query-event.patch b/patches/api/0174-Add-GS4-Query-event.patch similarity index 100% rename from patches/api/0173-Add-GS4-Query-event.patch rename to patches/api/0174-Add-GS4-Query-event.patch diff --git a/patches/api/0174-Add-PlayerPostRespawnEvent.patch b/patches/api/0175-Add-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/api/0174-Add-PlayerPostRespawnEvent.patch rename to patches/api/0175-Add-PlayerPostRespawnEvent.patch diff --git a/patches/api/0175-Ignore-package-private-methods-for-nullability-annot.patch b/patches/api/0176-Ignore-package-private-methods-for-nullability-annot.patch similarity index 100% rename from patches/api/0175-Ignore-package-private-methods-for-nullability-annot.patch rename to patches/api/0176-Ignore-package-private-methods-for-nullability-annot.patch diff --git a/patches/api/0176-Flip-some-Spigot-API-null-annotations.patch b/patches/api/0177-Flip-some-Spigot-API-null-annotations.patch similarity index 100% rename from patches/api/0176-Flip-some-Spigot-API-null-annotations.patch rename to patches/api/0177-Flip-some-Spigot-API-null-annotations.patch diff --git a/patches/api/0177-Server-Tick-Events.patch b/patches/api/0178-Server-Tick-Events.patch similarity index 100% rename from patches/api/0177-Server-Tick-Events.patch rename to patches/api/0178-Server-Tick-Events.patch diff --git a/patches/api/0178-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0179-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/api/0178-PlayerDeathEvent-getItemsToKeep.patch rename to patches/api/0179-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/api/0179-Add-Heightmap-API.patch b/patches/api/0180-Add-Heightmap-API.patch similarity index 100% rename from patches/api/0179-Add-Heightmap-API.patch rename to patches/api/0180-Add-Heightmap-API.patch diff --git a/patches/api/0180-Mob-Spawner-API-Enhancements.patch b/patches/api/0181-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/api/0180-Mob-Spawner-API-Enhancements.patch rename to patches/api/0181-Mob-Spawner-API-Enhancements.patch diff --git a/patches/api/0181-Add-BlockSoundGroup-interface.patch b/patches/api/0182-Add-BlockSoundGroup-interface.patch similarity index 100% rename from patches/api/0181-Add-BlockSoundGroup-interface.patch rename to patches/api/0182-Add-BlockSoundGroup-interface.patch diff --git a/patches/api/0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch similarity index 100% rename from patches/api/0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch rename to patches/api/0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch diff --git a/patches/api/0183-Increase-custom-payload-channel-message-size.patch b/patches/api/0184-Increase-custom-payload-channel-message-size.patch similarity index 100% rename from patches/api/0183-Increase-custom-payload-channel-message-size.patch rename to patches/api/0184-Increase-custom-payload-channel-message-size.patch diff --git a/patches/api/0184-Expose-the-internal-current-tick.patch b/patches/api/0185-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/api/0184-Expose-the-internal-current-tick.patch rename to patches/api/0185-Expose-the-internal-current-tick.patch diff --git a/patches/api/0185-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0186-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/api/0185-PlayerDeathEvent-shouldDropExperience.patch rename to patches/api/0186-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/api/0186-Add-effect-to-block-break-naturally.patch b/patches/api/0187-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/api/0186-Add-effect-to-block-break-naturally.patch rename to patches/api/0187-Add-effect-to-block-break-naturally.patch diff --git a/patches/api/0187-World-view-distance-api.patch b/patches/api/0188-World-view-distance-api.patch similarity index 100% rename from patches/api/0187-World-view-distance-api.patch rename to patches/api/0188-World-view-distance-api.patch diff --git a/patches/api/0188-Add-ThrownEggHatchEvent.patch b/patches/api/0189-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/api/0188-Add-ThrownEggHatchEvent.patch rename to patches/api/0189-Add-ThrownEggHatchEvent.patch diff --git a/patches/api/0189-Entity-Jump-API.patch b/patches/api/0190-Entity-Jump-API.patch similarity index 100% rename from patches/api/0189-Entity-Jump-API.patch rename to patches/api/0190-Entity-Jump-API.patch diff --git a/patches/api/0190-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0191-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/api/0190-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/api/0191-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/api/0191-Add-tick-times-API.patch b/patches/api/0192-Add-tick-times-API.patch similarity index 100% rename from patches/api/0191-Add-tick-times-API.patch rename to patches/api/0192-Add-tick-times-API.patch diff --git a/patches/api/0192-Expose-MinecraftServer-isRunning.patch b/patches/api/0193-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/api/0192-Expose-MinecraftServer-isRunning.patch rename to patches/api/0193-Expose-MinecraftServer-isRunning.patch diff --git a/patches/api/0193-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0194-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/api/0193-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/api/0194-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/api/0194-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/patches/api/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch similarity index 100% rename from patches/api/0194-Disable-Sync-Events-firing-Async-errors-during-shutd.patch rename to patches/api/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch diff --git a/patches/api/0195-Make-JavaPluginLoader-thread-safe.patch b/patches/api/0196-Make-JavaPluginLoader-thread-safe.patch similarity index 100% rename from patches/api/0195-Make-JavaPluginLoader-thread-safe.patch rename to patches/api/0196-Make-JavaPluginLoader-thread-safe.patch diff --git a/patches/api/0196-Add-Player-Client-Options-API.patch b/patches/api/0197-Add-Player-Client-Options-API.patch similarity index 100% rename from patches/api/0196-Add-Player-Client-Options-API.patch rename to patches/api/0197-Add-Player-Client-Options-API.patch diff --git a/patches/api/0197-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0198-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/api/0197-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/api/0198-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/api/0198-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch similarity index 100% rename from patches/api/0198-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch rename to patches/api/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch diff --git a/patches/api/0199-Add-item-slot-convenience-methods.patch b/patches/api/0200-Add-item-slot-convenience-methods.patch similarity index 100% rename from patches/api/0199-Add-item-slot-convenience-methods.patch rename to patches/api/0200-Add-item-slot-convenience-methods.patch diff --git a/patches/api/0200-Villager-Restocks-API.patch b/patches/api/0201-Villager-Restocks-API.patch similarity index 91% rename from patches/api/0200-Villager-Restocks-API.patch rename to patches/api/0201-Villager-Restocks-API.patch index e2dcfc314..689bd35b3 100644 --- a/patches/api/0200-Villager-Restocks-API.patch +++ b/patches/api/0201-Villager-Restocks-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Villager Restocks API diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java -index ef48ad9b28750ab7b33071f6b8e354e922731909..d1579153092c1b80350155110f1b9926b1a1ef57 100644 +index 6545e568b74bd096e184b85e8da6f0d40acd3b36..ef8a81c4857bd06be19264580bf3a7e087118f5c 100644 --- a/src/main/java/org/bukkit/entity/Villager.java +++ b/src/main/java/org/bukkit/entity/Villager.java @@ -77,6 +77,20 @@ public interface Villager extends AbstractVillager { diff --git a/patches/api/0201-Add-Mob-Goal-API.patch b/patches/api/0202-Add-Mob-Goal-API.patch similarity index 100% rename from patches/api/0201-Add-Mob-Goal-API.patch rename to patches/api/0202-Add-Mob-Goal-API.patch diff --git a/patches/api/0202-Add-villager-reputation-API.patch b/patches/api/0203-Add-villager-reputation-API.patch similarity index 100% rename from patches/api/0202-Add-villager-reputation-API.patch rename to patches/api/0203-Add-villager-reputation-API.patch diff --git a/patches/api/0203-Expose-game-version.patch b/patches/api/0204-Expose-game-version.patch similarity index 100% rename from patches/api/0203-Expose-game-version.patch rename to patches/api/0204-Expose-game-version.patch diff --git a/patches/api/0204-Spawn-Reason-API.patch b/patches/api/0205-Spawn-Reason-API.patch similarity index 100% rename from patches/api/0204-Spawn-Reason-API.patch rename to patches/api/0205-Spawn-Reason-API.patch diff --git a/patches/api/0205-Potential-bed-API.patch b/patches/api/0206-Potential-bed-API.patch similarity index 100% rename from patches/api/0205-Potential-bed-API.patch rename to patches/api/0206-Potential-bed-API.patch diff --git a/patches/api/0206-Prioritise-own-classes-where-possible.patch b/patches/api/0207-Prioritise-own-classes-where-possible.patch similarity index 100% rename from patches/api/0206-Prioritise-own-classes-where-possible.patch rename to patches/api/0207-Prioritise-own-classes-where-possible.patch diff --git a/patches/api/0207-Provide-a-useful-PluginClassLoader-toString.patch b/patches/api/0208-Provide-a-useful-PluginClassLoader-toString.patch similarity index 100% rename from patches/api/0207-Provide-a-useful-PluginClassLoader-toString.patch rename to patches/api/0208-Provide-a-useful-PluginClassLoader-toString.patch diff --git a/patches/api/0208-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0209-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/api/0208-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/api/0209-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/api/0209-Expose-Arrow-getItemStack.patch b/patches/api/0210-Expose-Arrow-getItemStack.patch similarity index 100% rename from patches/api/0209-Expose-Arrow-getItemStack.patch rename to patches/api/0210-Expose-Arrow-getItemStack.patch diff --git a/patches/api/0210-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/api/0210-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/api/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/api/0211-Support-components-in-ItemMeta.patch b/patches/api/0212-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/api/0211-Support-components-in-ItemMeta.patch rename to patches/api/0212-Support-components-in-ItemMeta.patch diff --git a/patches/api/0212-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch similarity index 100% rename from patches/api/0212-added-2-new-TargetReasons-for-1.16-mob-behavior.patch rename to patches/api/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch diff --git a/patches/api/0213-Add-entity-liquid-API.patch b/patches/api/0214-Add-entity-liquid-API.patch similarity index 100% rename from patches/api/0213-Add-entity-liquid-API.patch rename to patches/api/0214-Add-entity-liquid-API.patch diff --git a/patches/api/0214-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch similarity index 100% rename from patches/api/0214-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch rename to patches/api/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch diff --git a/patches/api/0215-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0216-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/api/0215-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0216-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/api/0216-Support-hex-colors-in-getLastColors.patch b/patches/api/0217-Support-hex-colors-in-getLastColors.patch similarity index 100% rename from patches/api/0216-Support-hex-colors-in-getLastColors.patch rename to patches/api/0217-Support-hex-colors-in-getLastColors.patch diff --git a/patches/api/0217-Add-setMaxPlayers-API.patch b/patches/api/0218-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/api/0217-Add-setMaxPlayers-API.patch rename to patches/api/0218-Add-setMaxPlayers-API.patch diff --git a/patches/api/0218-Add-moon-phase-API.patch b/patches/api/0219-Add-moon-phase-API.patch similarity index 100% rename from patches/api/0218-Add-moon-phase-API.patch rename to patches/api/0219-Add-moon-phase-API.patch diff --git a/patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0220-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/api/0220-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/api/0220-Add-BellRingEvent.patch b/patches/api/0221-Add-BellRingEvent.patch similarity index 100% rename from patches/api/0220-Add-BellRingEvent.patch rename to patches/api/0221-Add-BellRingEvent.patch diff --git a/patches/api/0221-Brand-support.patch b/patches/api/0222-Brand-support.patch similarity index 100% rename from patches/api/0221-Brand-support.patch rename to patches/api/0222-Brand-support.patch diff --git a/patches/api/0222-Add-more-Evoker-API.patch b/patches/api/0223-Add-more-Evoker-API.patch similarity index 100% rename from patches/api/0222-Add-more-Evoker-API.patch rename to patches/api/0223-Add-more-Evoker-API.patch diff --git a/patches/api/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/api/0224-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch similarity index 100% rename from patches/api/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch rename to patches/api/0224-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch diff --git a/patches/api/0224-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0225-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/api/0224-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/api/0225-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/api/0225-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0226-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/api/0225-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/api/0226-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/api/0226-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/api/0226-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/api/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/api/0227-Entity-isTicking.patch b/patches/api/0228-Entity-isTicking.patch similarity index 100% rename from patches/api/0227-Entity-isTicking.patch rename to patches/api/0228-Entity-isTicking.patch diff --git a/patches/api/0228-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch similarity index 100% rename from patches/api/0228-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch rename to patches/api/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch diff --git a/patches/api/0229-Villager-resetOffers.patch b/patches/api/0230-Villager-resetOffers.patch similarity index 100% rename from patches/api/0229-Villager-resetOffers.patch rename to patches/api/0230-Villager-resetOffers.patch diff --git a/patches/api/0230-Player-elytra-boost-API.patch b/patches/api/0231-Player-elytra-boost-API.patch similarity index 100% rename from patches/api/0230-Player-elytra-boost-API.patch rename to patches/api/0231-Player-elytra-boost-API.patch diff --git a/patches/api/0231-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0232-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/api/0231-Add-getOfflinePlayerIfCached-String.patch rename to patches/api/0232-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/api/0232-Add-ignore-discounts-API.patch b/patches/api/0233-Add-ignore-discounts-API.patch similarity index 100% rename from patches/api/0232-Add-ignore-discounts-API.patch rename to patches/api/0233-Add-ignore-discounts-API.patch diff --git a/patches/api/0233-Item-no-age-no-player-pickup.patch b/patches/api/0234-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/api/0233-Item-no-age-no-player-pickup.patch rename to patches/api/0234-Item-no-age-no-player-pickup.patch diff --git a/patches/api/0234-Beacon-API-custom-effect-ranges.patch b/patches/api/0235-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/api/0234-Beacon-API-custom-effect-ranges.patch rename to patches/api/0235-Beacon-API-custom-effect-ranges.patch diff --git a/patches/api/0235-Add-API-for-quit-reason.patch b/patches/api/0236-Add-API-for-quit-reason.patch similarity index 100% rename from patches/api/0235-Add-API-for-quit-reason.patch rename to patches/api/0236-Add-API-for-quit-reason.patch diff --git a/patches/api/0236-Add-Destroy-Speed-API.patch b/patches/api/0237-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/api/0236-Add-Destroy-Speed-API.patch rename to patches/api/0237-Add-Destroy-Speed-API.patch diff --git a/patches/api/0237-Add-LivingEntity-clearActiveItem.patch b/patches/api/0238-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/api/0237-Add-LivingEntity-clearActiveItem.patch rename to patches/api/0238-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/api/0238-Add-PlayerItemCooldownEvent.patch b/patches/api/0239-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/api/0238-Add-PlayerItemCooldownEvent.patch rename to patches/api/0239-Add-PlayerItemCooldownEvent.patch diff --git a/patches/api/0239-More-lightning-API.patch b/patches/api/0240-More-lightning-API.patch similarity index 100% rename from patches/api/0239-More-lightning-API.patch rename to patches/api/0240-More-lightning-API.patch diff --git a/patches/api/0240-Add-PlayerShearBlockEvent.patch b/patches/api/0241-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/api/0240-Add-PlayerShearBlockEvent.patch rename to patches/api/0241-Add-PlayerShearBlockEvent.patch diff --git a/patches/api/0241-Enable-multi-release-plugin-jars.patch b/patches/api/0242-Enable-multi-release-plugin-jars.patch similarity index 100% rename from patches/api/0241-Enable-multi-release-plugin-jars.patch rename to patches/api/0242-Enable-multi-release-plugin-jars.patch diff --git a/patches/api/0242-Player-Chunk-Load-Unload-Events.patch b/patches/api/0243-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/api/0242-Player-Chunk-Load-Unload-Events.patch rename to patches/api/0243-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/api/0243-Expose-LivingEntity-hurt-direction.patch b/patches/api/0244-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/api/0243-Expose-LivingEntity-hurt-direction.patch rename to patches/api/0244-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/api/0244-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/api/0244-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/api/0245-Added-PlayerTradeEvent.patch b/patches/api/0246-Added-PlayerTradeEvent.patch similarity index 100% rename from patches/api/0245-Added-PlayerTradeEvent.patch rename to patches/api/0246-Added-PlayerTradeEvent.patch diff --git a/patches/api/0246-Add-TargetHitEvent-API.patch b/patches/api/0247-Add-TargetHitEvent-API.patch similarity index 100% rename from patches/api/0246-Add-TargetHitEvent-API.patch rename to patches/api/0247-Add-TargetHitEvent-API.patch diff --git a/patches/api/0247-Additional-Block-Material-API-s.patch b/patches/api/0248-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/api/0247-Additional-Block-Material-API-s.patch rename to patches/api/0248-Additional-Block-Material-API-s.patch diff --git a/patches/api/0248-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/api/0248-Add-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/api/0249-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0250-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/api/0249-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/api/0250-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/api/0250-Zombie-API-breaking-doors.patch b/patches/api/0251-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/api/0250-Zombie-API-breaking-doors.patch rename to patches/api/0251-Zombie-API-breaking-doors.patch diff --git a/patches/api/0251-Add-EntityLoadCrossbowEvent.patch b/patches/api/0252-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/api/0251-Add-EntityLoadCrossbowEvent.patch rename to patches/api/0252-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/api/0252-Added-WorldGameRuleChangeEvent.patch b/patches/api/0253-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/api/0252-Added-WorldGameRuleChangeEvent.patch rename to patches/api/0253-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/api/0253-Added-ServerResourcesReloadedEvent.patch b/patches/api/0254-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/api/0253-Added-ServerResourcesReloadedEvent.patch rename to patches/api/0254-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/api/0254-Add-BlockFailedDispenseEvent.patch b/patches/api/0255-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/api/0254-Add-BlockFailedDispenseEvent.patch rename to patches/api/0255-Add-BlockFailedDispenseEvent.patch diff --git a/patches/api/0255-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0256-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/api/0255-Added-PlayerLecternPageChangeEvent.patch rename to patches/api/0256-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/api/0256-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0257-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/api/0256-Added-PlayerLoomPatternSelectEvent.patch rename to patches/api/0257-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/api/0257-Better-AnnotationTest-printout.patch b/patches/api/0258-Better-AnnotationTest-printout.patch similarity index 100% rename from patches/api/0257-Better-AnnotationTest-printout.patch rename to patches/api/0258-Better-AnnotationTest-printout.patch diff --git a/patches/api/0258-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch similarity index 100% rename from patches/api/0258-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch rename to patches/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch diff --git a/patches/api/0259-Add-sendOpLevel-API.patch b/patches/api/0260-Add-sendOpLevel-API.patch similarity index 100% rename from patches/api/0259-Add-sendOpLevel-API.patch rename to patches/api/0260-Add-sendOpLevel-API.patch diff --git a/patches/api/0260-Add-StructureLocateEvent.patch b/patches/api/0261-Add-StructureLocateEvent.patch similarity index 100% rename from patches/api/0260-Add-StructureLocateEvent.patch rename to patches/api/0261-Add-StructureLocateEvent.patch diff --git a/patches/api/0261-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/api/0262-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/api/0261-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/api/0262-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/api/0262-Add-BlockPreDispenseEvent.patch b/patches/api/0263-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/api/0262-Add-BlockPreDispenseEvent.patch rename to patches/api/0263-Add-BlockPreDispenseEvent.patch diff --git a/patches/api/0263-Added-Vanilla-Entity-Tags.patch b/patches/api/0264-Added-Vanilla-Entity-Tags.patch similarity index 100% rename from patches/api/0263-Added-Vanilla-Entity-Tags.patch rename to patches/api/0264-Added-Vanilla-Entity-Tags.patch diff --git a/patches/api/0264-added-Wither-API.patch b/patches/api/0265-added-Wither-API.patch similarity index 100% rename from patches/api/0264-added-Wither-API.patch rename to patches/api/0265-added-Wither-API.patch diff --git a/patches/api/0265-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0266-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/api/0265-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/api/0266-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/api/0266-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0267-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/api/0266-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/api/0267-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/api/0267-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0268-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/api/0267-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/api/0268-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/api/0268-EntityMoveEvent.patch b/patches/api/0269-EntityMoveEvent.patch similarity index 100% rename from patches/api/0268-EntityMoveEvent.patch rename to patches/api/0269-EntityMoveEvent.patch diff --git a/patches/api/0269-add-DragonEggFormEvent.patch b/patches/api/0270-add-DragonEggFormEvent.patch similarity index 100% rename from patches/api/0269-add-DragonEggFormEvent.patch rename to patches/api/0270-add-DragonEggFormEvent.patch diff --git a/patches/api/0270-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0271-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/api/0270-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/api/0271-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/api/0271-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0272-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/api/0271-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/api/0272-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/api/0272-living-entity-allow-attribute-registration.patch b/patches/api/0273-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/api/0272-living-entity-allow-attribute-registration.patch rename to patches/api/0273-living-entity-allow-attribute-registration.patch diff --git a/patches/api/0273-Add-missing-effects.patch b/patches/api/0274-Add-missing-effects.patch similarity index 100% rename from patches/api/0273-Add-missing-effects.patch rename to patches/api/0274-Add-missing-effects.patch diff --git a/patches/api/0274-Expose-Tracked-Players.patch b/patches/api/0275-Expose-Tracked-Players.patch similarity index 100% rename from patches/api/0274-Expose-Tracked-Players.patch rename to patches/api/0275-Expose-Tracked-Players.patch diff --git a/patches/api/0275-Cache-the-result-of-Material-isBlock.patch b/patches/api/0276-Cache-the-result-of-Material-isBlock.patch similarity index 100% rename from patches/api/0275-Cache-the-result-of-Material-isBlock.patch rename to patches/api/0276-Cache-the-result-of-Material-isBlock.patch diff --git a/patches/api/0276-Add-worldborder-events.patch b/patches/api/0277-Add-worldborder-events.patch similarity index 100% rename from patches/api/0276-Add-worldborder-events.patch rename to patches/api/0277-Add-worldborder-events.patch diff --git a/patches/api/0277-added-PlayerNameEntityEvent.patch b/patches/api/0278-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/api/0277-added-PlayerNameEntityEvent.patch rename to patches/api/0278-added-PlayerNameEntityEvent.patch diff --git a/patches/api/0278-Add-recipe-to-cook-events.patch b/patches/api/0279-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/api/0278-Add-recipe-to-cook-events.patch rename to patches/api/0279-Add-recipe-to-cook-events.patch diff --git a/patches/api/0279-Add-Block-isValidTool.patch b/patches/api/0280-Add-Block-isValidTool.patch similarity index 100% rename from patches/api/0279-Add-Block-isValidTool.patch rename to patches/api/0280-Add-Block-isValidTool.patch diff --git a/patches/api/0280-Implement-Keyed-on-World.patch b/patches/api/0281-Implement-Keyed-on-World.patch similarity index 100% rename from patches/api/0280-Implement-Keyed-on-World.patch rename to patches/api/0281-Implement-Keyed-on-World.patch diff --git a/patches/api/0281-fix-Inventory-getContents-null-annotations.patch b/patches/api/0282-fix-Inventory-getContents-null-annotations.patch similarity index 100% rename from patches/api/0281-fix-Inventory-getContents-null-annotations.patch rename to patches/api/0282-fix-Inventory-getContents-null-annotations.patch diff --git a/patches/api/0282-Item-Rarity-API.patch b/patches/api/0283-Item-Rarity-API.patch similarity index 100% rename from patches/api/0282-Item-Rarity-API.patch rename to patches/api/0283-Item-Rarity-API.patch diff --git a/patches/api/0283-Expose-protocol-version.patch b/patches/api/0284-Expose-protocol-version.patch similarity index 100% rename from patches/api/0283-Expose-protocol-version.patch rename to patches/api/0284-Expose-protocol-version.patch diff --git a/patches/api/0284-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/api/0285-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 100% rename from patches/api/0284-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/api/0285-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch diff --git a/patches/api/0285-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0286-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/api/0285-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/api/0286-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/api/0286-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0287-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/api/0286-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/api/0287-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/api/0287-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0288-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/api/0287-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/api/0288-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/api/0288-Added-PlayerDeepSleepEvent.patch b/patches/api/0289-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/api/0288-Added-PlayerDeepSleepEvent.patch rename to patches/api/0289-Added-PlayerDeepSleepEvent.patch diff --git a/patches/api/0289-More-World-API.patch b/patches/api/0290-More-World-API.patch similarity index 100% rename from patches/api/0289-More-World-API.patch rename to patches/api/0290-More-World-API.patch diff --git a/patches/api/0290-Added-PlayerBedFailEnterEvent.patch b/patches/api/0291-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/api/0290-Added-PlayerBedFailEnterEvent.patch rename to patches/api/0291-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/api/0291-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0292-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/api/0291-Introduce-beacon-activation-deactivation-events.patch rename to patches/api/0292-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/api/0292-PlayerMoveEvent-Improvements.patch b/patches/api/0293-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/api/0292-PlayerMoveEvent-Improvements.patch rename to patches/api/0293-PlayerMoveEvent-Improvements.patch diff --git a/patches/api/0293-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0294-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/api/0293-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/api/0294-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/api/0294-Add-more-WanderingTrader-API.patch b/patches/api/0295-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/api/0294-Add-more-WanderingTrader-API.patch rename to patches/api/0295-Add-more-WanderingTrader-API.patch diff --git a/patches/api/0295-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0296-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/api/0295-Add-EntityBlockStorage-clearEntities.patch rename to patches/api/0296-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/api/0296-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0297-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/api/0296-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/api/0297-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/api/0297-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0298-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0297-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0298-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0298-Inventory-close.patch b/patches/api/0299-Inventory-close.patch similarity index 100% rename from patches/api/0298-Inventory-close.patch rename to patches/api/0299-Inventory-close.patch diff --git a/patches/api/0299-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0300-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/api/0299-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/api/0300-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/api/0300-Add-basic-Datapack-API.patch b/patches/api/0301-Add-basic-Datapack-API.patch similarity index 100% rename from patches/api/0300-Add-basic-Datapack-API.patch rename to patches/api/0301-Add-basic-Datapack-API.patch diff --git a/patches/api/0301-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0302-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/api/0301-additions-to-PlayerGameModeChangeEvent.patch rename to patches/api/0302-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/api/0302-ItemStack-repair-check-API.patch b/patches/api/0303-ItemStack-repair-check-API.patch similarity index 100% rename from patches/api/0302-ItemStack-repair-check-API.patch rename to patches/api/0303-ItemStack-repair-check-API.patch diff --git a/patches/api/0303-More-Enchantment-API.patch b/patches/api/0304-More-Enchantment-API.patch similarity index 100% rename from patches/api/0303-More-Enchantment-API.patch rename to patches/api/0304-More-Enchantment-API.patch diff --git a/patches/api/0304-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/api/0304-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/api/0305-List-all-missing-hard-depends-not-just-first.patch b/patches/api/0306-List-all-missing-hard-depends-not-just-first.patch similarity index 100% rename from patches/api/0305-List-all-missing-hard-depends-not-just-first.patch rename to patches/api/0306-List-all-missing-hard-depends-not-just-first.patch diff --git a/patches/api/0306-Add-Mob-lookAt-API.patch b/patches/api/0307-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/api/0306-Add-Mob-lookAt-API.patch rename to patches/api/0307-Add-Mob-lookAt-API.patch diff --git a/patches/api/0307-ItemStack-editMeta.patch b/patches/api/0308-ItemStack-editMeta.patch similarity index 100% rename from patches/api/0307-ItemStack-editMeta.patch rename to patches/api/0308-ItemStack-editMeta.patch diff --git a/patches/api/0308-Add-EntityInsideBlockEvent.patch b/patches/api/0309-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/api/0308-Add-EntityInsideBlockEvent.patch rename to patches/api/0309-Add-EntityInsideBlockEvent.patch diff --git a/patches/api/0309-Attributes-API-for-item-defaults.patch b/patches/api/0310-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/api/0309-Attributes-API-for-item-defaults.patch rename to patches/api/0310-Attributes-API-for-item-defaults.patch diff --git a/patches/api/0310-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0311-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/api/0310-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/api/0311-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/api/0311-More-Lidded-Block-API.patch b/patches/api/0312-More-Lidded-Block-API.patch similarity index 100% rename from patches/api/0311-More-Lidded-Block-API.patch rename to patches/api/0312-More-Lidded-Block-API.patch diff --git a/patches/api/0312-Add-PlayerKickEvent-causes.patch b/patches/api/0313-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/api/0312-Add-PlayerKickEvent-causes.patch rename to patches/api/0313-Add-PlayerKickEvent-causes.patch diff --git a/patches/api/0312-Add-PufferFishStateChangeEvent.patch b/patches/api/0314-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/api/0312-Add-PufferFishStateChangeEvent.patch rename to patches/api/0314-Add-PufferFishStateChangeEvent.patch diff --git a/patches/api/0314-Add-BellRevealRaiderEvent.patch b/patches/api/0315-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/api/0314-Add-BellRevealRaiderEvent.patch rename to patches/api/0315-Add-BellRevealRaiderEvent.patch diff --git a/patches/api/0315-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0316-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/api/0315-Add-ElderGuardianAppearanceEvent.patch rename to patches/api/0316-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/api/0316-Add-more-line-of-sight-methods.patch b/patches/api/0317-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/api/0316-Add-more-line-of-sight-methods.patch rename to patches/api/0317-Add-more-line-of-sight-methods.patch diff --git a/patches/server/0290-PreSpawnerSpawnEvent.patch b/patches/server/0291-PreSpawnerSpawnEvent.patch similarity index 94% rename from patches/server/0290-PreSpawnerSpawnEvent.patch rename to patches/server/0291-PreSpawnerSpawnEvent.patch index fd48f263b..7a1e9d1d4 100644 --- a/patches/server/0290-PreSpawnerSpawnEvent.patch +++ b/patches/server/0291-PreSpawnerSpawnEvent.patch @@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for spawners. diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index c741f8e4a4b67d1bfed2d1bac36856c5688bb161..9228c0bc797fb95c8ac949bdc568eadafee84a80 100644 +index cfb820636f819a7da56d0302d49f39cea1b5a93d..7bf688057d684aa1b60f29294c9a7e81ab6742d1 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -138,11 +138,11 @@ public abstract class BaseSpawner { diff --git a/patches/server/0291-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0292-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 97% rename from patches/server/0291-Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/server/0292-Don-t-allow-digging-into-unloaded-chunks.patch index c74abe7bd..6a1a7e75b 100644 --- a/patches/server/0291-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/patches/server/0292-Don-t-allow-digging-into-unloaded-chunks.patch @@ -51,7 +51,7 @@ index 315dad4789f5f2582ee9b4fc176affd1f57537ef..f4a056185990181e486f452960159a52 this.level.destroyBlockProgress(this.player.getId(), pos, -1); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5f4718fa42be0ade1a40c0472efbbd0c65f061a7..8b716c625c363d7143fe6fbc26d3d674d62a5833 100644 +index cdcfc4390eca3dbb3395c29f300acce661a5e494..674d83f05246f7c6c9c9e1674c9428cfe0322cda 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1558,6 +1558,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0292-Make-the-default-permission-message-configurable.patch b/patches/server/0293-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/server/0292-Make-the-default-permission-message-configurable.patch rename to patches/server/0293-Make-the-default-permission-message-configurable.patch diff --git a/patches/server/0293-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0294-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from patches/server/0293-Prevent-rayTrace-from-loading-chunks.patch rename to patches/server/0294-Prevent-rayTrace-from-loading-chunks.patch diff --git a/patches/server/0294-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0295-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0294-Handle-Large-Packets-disconnecting-client.patch rename to patches/server/0295-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/0295-force-entity-dismount-during-teleportation.patch b/patches/server/0296-force-entity-dismount-during-teleportation.patch similarity index 97% rename from patches/server/0295-force-entity-dismount-during-teleportation.patch rename to patches/server/0296-force-entity-dismount-during-teleportation.patch index 73280109b..a19c63855 100644 --- a/patches/server/0295-force-entity-dismount-during-teleportation.patch +++ b/patches/server/0296-force-entity-dismount-during-teleportation.patch @@ -20,7 +20,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 5eb37fb1ae861940839fe6815b57111812d6b3ec..963a3c159e912a39b98dfcb3fdb8c384765990d7 100644 +index 13dace1a8fcde011d26d37049ae3ca14d86990fc..8e86ca5221236ab3ab61d7a6859b64be9e5d8f97 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1299,11 +1299,13 @@ public class ServerPlayer extends Player { @@ -41,7 +41,7 @@ index 5eb37fb1ae861940839fe6815b57111812d6b3ec..963a3c159e912a39b98dfcb3fdb8c384 if (entity1 != entity && this.connection != null) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f9f51b84036f522cdfc4ca6d47c074d51c14bf08..fcfee0f2b2b073b0c642684fddfb8d3c4eacf4f9 100644 +index d92a54022478eac52abf035aee89d91acf29c874..7b7c554ab22cee655d19eed793f45706f0311234 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2214,12 +2214,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0296-Add-more-Zombie-API.patch b/patches/server/0297-Add-more-Zombie-API.patch similarity index 100% rename from patches/server/0296-Add-more-Zombie-API.patch rename to patches/server/0297-Add-more-Zombie-API.patch diff --git a/patches/server/0297-Book-Size-Limits.patch b/patches/server/0298-Book-Size-Limits.patch similarity index 97% rename from patches/server/0297-Book-Size-Limits.patch rename to patches/server/0298-Book-Size-Limits.patch index 0ac81c635..56321d1d6 100644 --- a/patches/server/0297-Book-Size-Limits.patch +++ b/patches/server/0298-Book-Size-Limits.patch @@ -24,7 +24,7 @@ index 11d628869a9a6eda8bf21a4f213ff23ad753b18e..8bf4d2b8c38c02d6a5b2fea37113689a private static void asyncChunks() { ConfigurationSection section; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8b716c625c363d7143fe6fbc26d3d674d62a5833..f1a8470d0b314c8fa5eade198cffc1f8cd5e6832 100644 +index 674d83f05246f7c6c9c9e1674c9428cfe0322cda..6f657c8b3a147fbd4cf625e89cb6023ee2967c07 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1002,6 +1002,52 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0298-Add-PlayerConnectionCloseEvent.patch b/patches/server/0299-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0298-Add-PlayerConnectionCloseEvent.patch rename to patches/server/0299-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0299-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0300-Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from patches/server/0299-Prevent-Enderman-from-loading-chunks.patch rename to patches/server/0300-Prevent-Enderman-from-loading-chunks.patch diff --git a/patches/server/0300-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0301-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 98% rename from patches/server/0300-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/server/0301-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 0cd88c977..1dfa1b892 100644 --- a/patches/server/0300-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/patches/server/0301-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 963a3c159e912a39b98dfcb3fdb8c384765990d7..44da4efc23a3273449431845308ba889615ac425 100644 +index 8e86ca5221236ab3ab61d7a6859b64be9e5d8f97..091d4fa14d286ad4777750fff2b315335e46e379 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -218,6 +218,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0301-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0302-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 91% rename from patches/server/0301-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/server/0302-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index f822adc55..45a56c914 100644 --- a/patches/server/0301-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/patches/server/0302-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 44da4efc23a3273449431845308ba889615ac425..955a7fcd80a57f920e402a5533f5029b9683104c 100644 +index 091d4fa14d286ad4777750fff2b315335e46e379..8f558fac783783c27c89b3b64a8d1feaa1c82d46 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1538,6 +1538,13 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0302-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/patches/server/0303-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch similarity index 100% rename from patches/server/0302-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch rename to patches/server/0303-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch diff --git a/patches/server/0303-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0304-Block-Entity-remove-from-being-called-on-Players.patch similarity index 100% rename from patches/server/0303-Block-Entity-remove-from-being-called-on-Players.patch rename to patches/server/0304-Block-Entity-remove-from-being-called-on-Players.patch diff --git a/patches/server/0304-BlockDestroyEvent.patch b/patches/server/0305-BlockDestroyEvent.patch similarity index 100% rename from patches/server/0304-BlockDestroyEvent.patch rename to patches/server/0305-BlockDestroyEvent.patch diff --git a/patches/server/0305-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0306-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 100% rename from patches/server/0305-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to patches/server/0306-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch diff --git a/patches/server/0306-Limit-Client-Sign-length-more.patch b/patches/server/0307-Limit-Client-Sign-length-more.patch similarity index 97% rename from patches/server/0306-Limit-Client-Sign-length-more.patch rename to patches/server/0307-Limit-Client-Sign-length-more.patch index 877afd37b..eb442a11d 100644 --- a/patches/server/0306-Limit-Client-Sign-length-more.patch +++ b/patches/server/0307-Limit-Client-Sign-length-more.patch @@ -22,7 +22,7 @@ it only impacts data sent from the client. Set -DPaper.maxSignLength=XX to change limit or -1 to disable diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f1a8470d0b314c8fa5eade198cffc1f8cd5e6832..defebf7b45e4f006fa7e575b5dbd01ac1e231d5a 100644 +index 6f657c8b3a147fbd4cf625e89cb6023ee2967c07..d8312d29103dd10f2b0634de5a056774d06d3263 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -255,6 +255,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0307-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0308-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 100% rename from patches/server/0307-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to patches/server/0308-Don-t-check-ConvertSigns-boolean-every-sign-save.patch diff --git a/patches/server/0308-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0309-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0308-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0309-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0309-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0310-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from patches/server/0309-Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/server/0310-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/patches/server/0310-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/patches/server/0311-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch similarity index 100% rename from patches/server/0310-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch rename to patches/server/0311-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch diff --git a/patches/server/0311-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0312-Set-Zombie-last-tick-at-start-of-drowning-process.patch similarity index 100% rename from patches/server/0311-Set-Zombie-last-tick-at-start-of-drowning-process.patch rename to patches/server/0312-Set-Zombie-last-tick-at-start-of-drowning-process.patch diff --git a/patches/server/0312-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0313-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/0312-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/server/0313-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/0313-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/server/0314-Use-proper-max-length-when-serialising-BungeeCord-te.patch similarity index 100% rename from patches/server/0313-Use-proper-max-length-when-serialising-BungeeCord-te.patch rename to patches/server/0314-Use-proper-max-length-when-serialising-BungeeCord-te.patch diff --git a/patches/server/0314-Entity-getEntitySpawnReason.patch b/patches/server/0315-Entity-getEntitySpawnReason.patch similarity index 97% rename from patches/server/0314-Entity-getEntitySpawnReason.patch rename to patches/server/0315-Entity-getEntitySpawnReason.patch index 33f056c7f..a034031ad 100644 --- a/patches/server/0314-Entity-getEntitySpawnReason.patch +++ b/patches/server/0315-Entity-getEntitySpawnReason.patch @@ -35,7 +35,7 @@ index ea336bdf2f15aabe74de82ef6c29b93573254e31..da3100d6577166e222164c174b280205 }); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index fcfee0f2b2b073b0c642684fddfb8d3c4eacf4f9..47503fa2feabf6615f250d13f25f080d19c2f560 100644 +index 7b7c554ab22cee655d19eed793f45706f0311234..434618dcb3d4261eb1db20b8f0807c9aba6b8332 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -67,6 +67,8 @@ import net.minecraft.world.InteractionHand; @@ -93,7 +93,7 @@ index fcfee0f2b2b073b0c642684fddfb8d3c4eacf4f9..47503fa2feabf6615f250d13f25f080d } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index cfb820636f819a7da56d0302d49f39cea1b5a93d..9a8af1867315840518533381e594fc50542cd72d 100644 +index 7bf688057d684aa1b60f29294c9a7e81ab6742d1..66ae43c40d4bad373b3a5269e8c78d7a3b3ac498 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -188,6 +188,7 @@ public abstract class BaseSpawner { diff --git a/patches/server/0315-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0316-Update-entity-Metadata-for-all-tracked-players.patch similarity index 96% rename from patches/server/0315-Update-entity-Metadata-for-all-tracked-players.patch rename to patches/server/0316-Update-entity-Metadata-for-all-tracked-players.patch index 8804fcd54..4b63ab166 100644 --- a/patches/server/0315-Update-entity-Metadata-for-all-tracked-players.patch +++ b/patches/server/0316-Update-entity-Metadata-for-all-tracked-players.patch @@ -22,7 +22,7 @@ index ad9bbda31a4cdb306ca40f2b99e4b815c4f136bd..28afe2f238ded241acf77c3272a44068 this.broadcast.accept(packet); if (this.entity instanceof ServerPlayer) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index defebf7b45e4f006fa7e575b5dbd01ac1e231d5a..6c4266d847b1181a055fa425d5734032dadabf93 100644 +index d8312d29103dd10f2b0634de5a056774d06d3263..8b76ac2e7462cf56c2d5019d12f7e839bfbc8b1e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2289,7 +2289,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0316-Fire-event-on-GS4-query.patch b/patches/server/0317-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0316-Fire-event-on-GS4-query.patch rename to patches/server/0317-Fire-event-on-GS4-query.patch diff --git a/patches/server/0317-Implement-PlayerPostRespawnEvent.patch b/patches/server/0318-Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/0317-Implement-PlayerPostRespawnEvent.patch rename to patches/server/0318-Implement-PlayerPostRespawnEvent.patch diff --git a/patches/server/0318-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0319-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/0318-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/server/0319-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/0319-Server-Tick-Events.patch b/patches/server/0320-Server-Tick-Events.patch similarity index 100% rename from patches/server/0319-Server-Tick-Events.patch rename to patches/server/0320-Server-Tick-Events.patch diff --git a/patches/server/0320-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0321-PlayerDeathEvent-getItemsToKeep.patch similarity index 96% rename from patches/server/0320-PlayerDeathEvent-getItemsToKeep.patch rename to patches/server/0321-PlayerDeathEvent-getItemsToKeep.patch index 86899d631..6c015bede 100644 --- a/patches/server/0320-PlayerDeathEvent-getItemsToKeep.patch +++ b/patches/server/0321-PlayerDeathEvent-getItemsToKeep.patch @@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 955a7fcd80a57f920e402a5533f5029b9683104c..679f1e3ef4c19ab466cf2d06c47b1018aabaa7bf 100644 +index 8f558fac783783c27c89b3b64a8d1feaa1c82d46..62a43f3e6f27245a0baec7ff703ec023dd4e5e05 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -729,6 +729,46 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0321-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0322-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/0321-Optimize-Captured-TileEntity-Lookup.patch rename to patches/server/0322-Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/0322-Add-Heightmap-API.patch b/patches/server/0323-Add-Heightmap-API.patch similarity index 100% rename from patches/server/0322-Add-Heightmap-API.patch rename to patches/server/0323-Add-Heightmap-API.patch diff --git a/patches/server/0323-Mob-Spawner-API-Enhancements.patch b/patches/server/0324-Mob-Spawner-API-Enhancements.patch similarity index 98% rename from patches/server/0323-Mob-Spawner-API-Enhancements.patch rename to patches/server/0324-Mob-Spawner-API-Enhancements.patch index c19c11852..60d952f8b 100644 --- a/patches/server/0323-Mob-Spawner-API-Enhancements.patch +++ b/patches/server/0324-Mob-Spawner-API-Enhancements.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Mob Spawner API Enhancements diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index 9a8af1867315840518533381e594fc50542cd72d..68ce2732dfdc25ddadc15c43c30a609f9b1eba86 100644 +index 66ae43c40d4bad373b3a5269e8c78d7a3b3ac498..a87531f4669c7947e02764b5ceb098385ad99159 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -31,7 +31,7 @@ public abstract class BaseSpawner { diff --git a/patches/server/0324-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0325-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 91% rename from patches/server/0324-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/server/0325-Fix-CB-call-to-changed-postToMainThread-method.patch index 90c34e057..260247a1e 100644 --- a/patches/server/0324-Fix-CB-call-to-changed-postToMainThread-method.patch +++ b/patches/server/0325-Fix-CB-call-to-changed-postToMainThread-method.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6c4266d847b1181a055fa425d5734032dadabf93..377e224acb06bfd5f769b5f75b7f52129394b494 100644 +index 8b76ac2e7462cf56c2d5019d12f7e839bfbc8b1e..fc7776e081a76d52e5890ba05f750944e5a1d402 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -440,7 +440,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0325-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0326-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0325-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/server/0326-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0326-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0327-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch similarity index 100% rename from patches/server/0326-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch rename to patches/server/0327-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch diff --git a/patches/server/0327-improve-CraftWorld-isChunkLoaded.patch b/patches/server/0328-improve-CraftWorld-isChunkLoaded.patch similarity index 100% rename from patches/server/0327-improve-CraftWorld-isChunkLoaded.patch rename to patches/server/0328-improve-CraftWorld-isChunkLoaded.patch diff --git a/patches/server/0328-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0329-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 100% rename from patches/server/0328-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/server/0329-Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/patches/server/0329-ChunkMapDistance-CME.patch b/patches/server/0330-ChunkMapDistance-CME.patch similarity index 100% rename from patches/server/0329-ChunkMapDistance-CME.patch rename to patches/server/0330-ChunkMapDistance-CME.patch diff --git a/patches/server/0330-Implement-CraftBlockSoundGroup.patch b/patches/server/0331-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0330-Implement-CraftBlockSoundGroup.patch rename to patches/server/0331-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0331-Chunk-debug-command.patch b/patches/server/0332-Chunk-debug-command.patch similarity index 100% rename from patches/server/0331-Chunk-debug-command.patch rename to patches/server/0332-Chunk-debug-command.patch diff --git a/patches/server/0332-Fix-World-isChunkGenerated-calls.patch b/patches/server/0333-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0332-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0333-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0333-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0334-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/0333-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/server/0334-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/0334-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0335-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0334-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/server/0335-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0335-Configurable-projectile-relative-velocity.patch b/patches/server/0336-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0335-Configurable-projectile-relative-velocity.patch rename to patches/server/0336-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0336-offset-item-frame-ticking.patch b/patches/server/0337-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0336-offset-item-frame-ticking.patch rename to patches/server/0337-offset-item-frame-ticking.patch diff --git a/patches/server/0337-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/patches/server/0338-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch similarity index 100% rename from patches/server/0337-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch rename to patches/server/0338-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch diff --git a/patches/server/0338-Fix-MC-158900.patch b/patches/server/0339-Fix-MC-158900.patch similarity index 100% rename from patches/server/0338-Fix-MC-158900.patch rename to patches/server/0339-Fix-MC-158900.patch diff --git a/patches/server/0339-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0340-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0339-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0340-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0340-Generator-Settings.patch b/patches/server/0341-Generator-Settings.patch similarity index 100% rename from patches/server/0340-Generator-Settings.patch rename to patches/server/0341-Generator-Settings.patch diff --git a/patches/server/0341-Fix-MC-161754.patch b/patches/server/0342-Fix-MC-161754.patch similarity index 100% rename from patches/server/0341-Fix-MC-161754.patch rename to patches/server/0342-Fix-MC-161754.patch diff --git a/patches/server/0342-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/patches/server/0343-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch similarity index 100% rename from patches/server/0342-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch rename to patches/server/0343-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch diff --git a/patches/server/0343-Expose-the-internal-current-tick.patch b/patches/server/0344-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0343-Expose-the-internal-current-tick.patch rename to patches/server/0344-Expose-the-internal-current-tick.patch diff --git a/patches/server/0344-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/patches/server/0345-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch similarity index 94% rename from patches/server/0344-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch rename to patches/server/0345-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch index 559cc6317..a87c2ad2b 100644 --- a/patches/server/0344-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch +++ b/patches/server/0345-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657) diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 679f1e3ef4c19ab466cf2d06c47b1018aabaa7bf..8da35a7dde494b059e542d049d7ee039deb5833d 100644 +index 62a43f3e6f27245a0baec7ff703ec023dd4e5e05..6086f86e6fd0395553aef42df4aef6a117231896 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1101,6 +1101,8 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0345-Add-option-to-disable-pillager-patrols.patch b/patches/server/0346-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0345-Add-option-to-disable-pillager-patrols.patch rename to patches/server/0346-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0346-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0347-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch similarity index 92% rename from patches/server/0346-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch rename to patches/server/0347-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch index fcb643423..55d9df04d 100644 --- a/patches/server/0346-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch +++ b/patches/server/0347-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch @@ -7,7 +7,7 @@ Fixes an AssertionError when setting the player's item in hand to null or a new Fixes GH-2718 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 377e224acb06bfd5f769b5f75b7f52129394b494..9240064a17e7ac2492fe157b759d1f724105cd0e 100644 +index fc7776e081a76d52e5890ba05f750944e5a1d402..9c5eba2cbd7399c8e3f8c5c3dad228ded6d57832 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1741,6 +1741,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0347-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0348-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0347-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/server/0348-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0348-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0349-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0348-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/server/0349-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0349-Optimize-Hoppers.patch b/patches/server/0350-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0349-Optimize-Hoppers.patch rename to patches/server/0350-Optimize-Hoppers.patch diff --git a/patches/server/0350-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0351-PlayerDeathEvent-shouldDropExperience.patch similarity index 91% rename from patches/server/0350-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0351-PlayerDeathEvent-shouldDropExperience.patch index 40e04c2c4..bf75aa191 100644 --- a/patches/server/0350-PlayerDeathEvent-shouldDropExperience.patch +++ b/patches/server/0351-PlayerDeathEvent-shouldDropExperience.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8da35a7dde494b059e542d049d7ee039deb5833d..4fef4c0240be90ddcb9640f5719e292d2d5dbdf8 100644 +index 6086f86e6fd0395553aef42df4aef6a117231896..018632aa8b122f8c013579075615d88d712f4250 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -849,7 +849,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0351-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0352-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0351-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0352-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0352-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0353-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0352-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0353-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0353-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0354-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0353-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/server/0354-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0354-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0355-Optimise-IEntityAccess-getPlayerByUUID.patch similarity index 100% rename from patches/server/0354-Optimise-IEntityAccess-getPlayerByUUID.patch rename to patches/server/0355-Optimise-IEntityAccess-getPlayerByUUID.patch diff --git a/patches/server/0355-Fix-items-not-falling-correctly.patch b/patches/server/0356-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0355-Fix-items-not-falling-correctly.patch rename to patches/server/0356-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0356-Lag-compensate-eating.patch b/patches/server/0357-Lag-compensate-eating.patch similarity index 100% rename from patches/server/0356-Lag-compensate-eating.patch rename to patches/server/0357-Lag-compensate-eating.patch diff --git a/patches/server/0357-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0358-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0357-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0358-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0358-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0359-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0358-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/server/0359-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0359-Add-effect-to-block-break-naturally.patch b/patches/server/0360-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/server/0359-Add-effect-to-block-break-naturally.patch rename to patches/server/0360-Add-effect-to-block-break-naturally.patch diff --git a/patches/server/0360-Entity-Activation-Range-2.0.patch b/patches/server/0361-Entity-Activation-Range-2.0.patch similarity index 99% rename from patches/server/0360-Entity-Activation-Range-2.0.patch rename to patches/server/0361-Entity-Activation-Range-2.0.patch index 8496b9c17..b3fddc85d 100644 --- a/patches/server/0360-Entity-Activation-Range-2.0.patch +++ b/patches/server/0361-Entity-Activation-Range-2.0.patch @@ -124,7 +124,7 @@ index fe98fa03548922903e4fb352fbdfeeaac87450df..8d72e68fe8f7d0a770264f54c539ea11 } else { passenger.stopRiding(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 47503fa2feabf6615f250d13f25f080d19c2f560..6b93b4e7717efbe68de3f1afe4843023e22c06bb 100644 +index 434618dcb3d4261eb1db20b8f0807c9aba6b8332..9ebbcd15dee0141eca83187a85e0d9b0b5a0fa86 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -277,7 +277,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -180,7 +180,7 @@ index f48435dc344fb48feb48e2a141b394829058c5c4..bd1cc5e6fea4b9a171718c1249f65278 public float yya; public float zza; diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 32e8ae0d2a0f78af671a632c4d1be58a0b38a392..79e10f41b2993a02c4218551b06673f1848325a3 100644 +index 1dcfab8776c9da4c461ebd98187b65bc6ed7dc4d..c9324245d18f8268191c0a89b465ef3054dd014d 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -117,7 +117,7 @@ public abstract class Mob extends LivingEntity { @@ -293,7 +293,7 @@ index 065d0752db0e3ae2a89d707aaa2145807f50ecad..c93805ae832d049ea13ca495b778ed52 } } diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index aec77679584a2acab5818e26e2586b5316118e84..9c7cb4f11c429ca5006cf5e178326ead1658581d 100644 +index 555cf6d39108d40998adbbaf6b09dd9973f5f2e3..426fa33c9e5ddf2de5435859ee4a5f352313869c 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -227,17 +227,29 @@ public class Villager extends AbstractVillager implements ReputationEventHandler diff --git a/patches/server/0361-Increase-Light-Queue-Size.patch b/patches/server/0362-Increase-Light-Queue-Size.patch similarity index 100% rename from patches/server/0361-Increase-Light-Queue-Size.patch rename to patches/server/0362-Increase-Light-Queue-Size.patch diff --git a/patches/server/0362-Fix-Light-Command.patch b/patches/server/0363-Fix-Light-Command.patch similarity index 100% rename from patches/server/0362-Fix-Light-Command.patch rename to patches/server/0363-Fix-Light-Command.patch diff --git a/patches/server/0363-No-Tick-view-distance-implementation.patch b/patches/server/0364-No-Tick-view-distance-implementation.patch similarity index 99% rename from patches/server/0363-No-Tick-view-distance-implementation.patch rename to patches/server/0364-No-Tick-view-distance-implementation.patch index 50391a3d4..96b59e178 100644 --- a/patches/server/0363-No-Tick-view-distance-implementation.patch +++ b/patches/server/0364-No-Tick-view-distance-implementation.patch @@ -513,7 +513,7 @@ index 45c7ebe67019cdbe88b6617a95d5c40d3a68286c..38eebda226e007c8910e04f502ce218c if (withinViewDistance) { DistanceManager.this.ticketThrottlerInput.tell(ChunkTaskPriorityQueueSorter.message(() -> { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4fef4c0240be90ddcb9640f5719e292d2d5dbdf8..bffc897cb88a54c36432c98264f3416051aeab17 100644 +index 018632aa8b122f8c013579075615d88d712f4250..92a77fa90828cc4bc3d9217d2df37ffeec6ee58e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -241,6 +241,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0364-Implement-alternative-item-despawn-rate.patch b/patches/server/0365-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0364-Implement-alternative-item-despawn-rate.patch rename to patches/server/0365-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0365-Tracking-Range-Improvements.patch b/patches/server/0366-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0365-Tracking-Range-Improvements.patch rename to patches/server/0366-Tracking-Range-Improvements.patch diff --git a/patches/server/0366-Fix-items-vanishing-through-end-portal.patch b/patches/server/0367-Fix-items-vanishing-through-end-portal.patch similarity index 93% rename from patches/server/0366-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0367-Fix-items-vanishing-through-end-portal.patch index d64b93474..7ba3ecfef 100644 --- a/patches/server/0366-Fix-items-vanishing-through-end-portal.patch +++ b/patches/server/0367-Fix-items-vanishing-through-end-portal.patch @@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the heightmap resolves the issue without having to load all spawn chunks. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6b93b4e7717efbe68de3f1afe4843023e22c06bb..999cf6f54133fb70bff56f93347e9916b58e1e3a 100644 +index 9ebbcd15dee0141eca83187a85e0d9b0b5a0fa86..b4694693814ca37ca33fef10bd87e05c228c9fa1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2984,6 +2984,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0367-implement-optional-per-player-mob-spawns.patch b/patches/server/0368-implement-optional-per-player-mob-spawns.patch similarity index 99% rename from patches/server/0367-implement-optional-per-player-mob-spawns.patch rename to patches/server/0368-implement-optional-per-player-mob-spawns.patch index c999eb08b..27117d65e 100644 --- a/patches/server/0367-implement-optional-per-player-mob-spawns.patch +++ b/patches/server/0368-implement-optional-per-player-mob-spawns.patch @@ -627,7 +627,7 @@ index c47d1772044913475a60292162ef4be594bed4c6..78143fe566fef13604c46029d4184ba3 this.lastSpawnState = spawnercreature_d; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index bffc897cb88a54c36432c98264f3416051aeab17..14a0190ea5e9a387582736bb130c16a3bc94151e 100644 +index 92a77fa90828cc4bc3d9217d2df37ffeec6ee58e..ec7804e80f9c6b0fc53eb67823c6325a685c850b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -90,12 +90,7 @@ import net.minecraft.world.damagesource.DamageSource; diff --git a/patches/server/0368-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0369-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0368-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0369-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0369-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0370-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0369-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0370-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0370-Allow-overriding-the-java-version-check.patch b/patches/server/0371-Allow-overriding-the-java-version-check.patch similarity index 100% rename from patches/server/0370-Allow-overriding-the-java-version-check.patch rename to patches/server/0371-Allow-overriding-the-java-version-check.patch diff --git a/patches/server/0371-Add-ThrownEggHatchEvent.patch b/patches/server/0372-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0371-Add-ThrownEggHatchEvent.patch rename to patches/server/0372-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0372-Optimise-random-block-ticking.patch b/patches/server/0373-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0372-Optimise-random-block-ticking.patch rename to patches/server/0373-Optimise-random-block-ticking.patch diff --git a/patches/server/0373-Entity-Jump-API.patch b/patches/server/0374-Entity-Jump-API.patch similarity index 100% rename from patches/server/0373-Entity-Jump-API.patch rename to patches/server/0374-Entity-Jump-API.patch diff --git a/patches/server/0374-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0375-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 97% rename from patches/server/0374-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0375-Add-option-to-nerf-pigmen-from-nether-portals.patch index f33d6ed44..683ab55ae 100644 --- a/patches/server/0374-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/patches/server/0375-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -21,7 +21,7 @@ index 16f013ffe992a934e9d0b32e764a14a8fd204449..6c7e90f9939d42fdf8d40dd7ec0a6a86 private void lightQueueSize() { lightQueueSize = getInt("light-queue-size", lightQueueSize); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 999cf6f54133fb70bff56f93347e9916b58e1e3a..d97319136d6cded2a12cb9ae4f9aa921ff59882c 100644 +index b4694693814ca37ca33fef10bd87e05c228c9fa1..eb35b18f4875367723ed2e57f19fabca4360ed54 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -308,6 +308,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0375-Make-the-GUI-graph-fancier.patch b/patches/server/0376-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0375-Make-the-GUI-graph-fancier.patch rename to patches/server/0376-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0376-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0377-add-hand-to-BlockMultiPlaceEvent.patch similarity index 93% rename from patches/server/0376-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0377-add-hand-to-BlockMultiPlaceEvent.patch index 02e47511b..633352946 100644 --- a/patches/server/0376-add-hand-to-BlockMultiPlaceEvent.patch +++ b/patches/server/0377-add-hand-to-BlockMultiPlaceEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index c3341d1c4e9cda85b0b236461b0a00cbebc9a856..98bec353d6dbd85c7b329f75e09f4d0bfcfdaa6c 100644 +index 4524d1af433750d763599dc990b8eda511ec0bad..60226f5c408ebd83c958d6644204bfc03365638a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -339,13 +339,18 @@ public class CraftEventFactory { diff --git a/patches/server/0377-Prevent-teleporting-dead-entities.patch b/patches/server/0378-Prevent-teleporting-dead-entities.patch similarity index 91% rename from patches/server/0377-Prevent-teleporting-dead-entities.patch rename to patches/server/0378-Prevent-teleporting-dead-entities.patch index 59a60c41a..3def460b5 100644 --- a/patches/server/0377-Prevent-teleporting-dead-entities.patch +++ b/patches/server/0378-Prevent-teleporting-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9240064a17e7ac2492fe157b759d1f724105cd0e..fcfd57fd7af655aafb330986e8f6f9cc55819165 100644 +index 9c5eba2cbd7399c8e3f8c5c3dad228ded6d57832..85a82c8bb98edec526260680ddfbcb36926b97ee 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1501,6 +1501,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0378-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0379-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0378-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0379-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0379-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0380-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0379-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0380-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0380-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0381-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0380-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0381-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0381-Optimise-Chunk-getFluid.patch b/patches/server/0382-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0381-Optimise-Chunk-getFluid.patch rename to patches/server/0382-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0382-Optimise-TickListServer-by-rewriting-it.patch b/patches/server/0383-Optimise-TickListServer-by-rewriting-it.patch similarity index 100% rename from patches/server/0382-Optimise-TickListServer-by-rewriting-it.patch rename to patches/server/0383-Optimise-TickListServer-by-rewriting-it.patch diff --git a/patches/server/0383-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0384-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 98% rename from patches/server/0383-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0384-Pillager-patrol-spawn-settings-and-per-player-option.patch index 150228e97..b2bc5ab21 100644 --- a/patches/server/0383-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/patches/server/0384-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -36,7 +36,7 @@ index 0863bdab8322b80a3df52c238b55c14401bafe6d..4a2b52b5f5c0453c204765ec77e35524 private void entitiesTargetWithFollowRange() { entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 14a0190ea5e9a387582736bb130c16a3bc94151e..c3ed4358b0cb6f252f9e3f71abe4ec9624cb7694 100644 +index ec7804e80f9c6b0fc53eb67823c6325a685c850b..9e6d6db0782751895afe345b4d6f586389ec2392 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -214,6 +214,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0384-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0385-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0384-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0385-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0385-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 95% rename from patches/server/0385-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch index 5e703d198..2ce1c37a1 100644 --- a/patches/server/0385-Do-not-allow-bees-to-load-chunks-for-beehives.patch +++ b/patches/server/0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not allow bees to load chunks for beehives diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index 3d049e43c8ea85597e98e9dad61c8d4c49b01b1c..207e6f411491d01f9ca5b49aa65a66e16255ff3e 100644 +index 50724baf5eb207ce44be62509f9a024d9a0e10f3..9b6dd82e5e6e4ba6290e1931c2e9756d93f323d8 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -409,6 +409,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { diff --git a/patches/server/0386-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0386-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0387-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0388-Optimize-Collision-to-not-load-chunks.patch similarity index 98% rename from patches/server/0387-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0388-Optimize-Collision-to-not-load-chunks.patch index 2387b545f..a57bb431d 100644 --- a/patches/server/0387-Optimize-Collision-to-not-load-chunks.patch +++ b/patches/server/0388-Optimize-Collision-to-not-load-chunks.patch @@ -26,7 +26,7 @@ index 2730923bd0bf3b0f928765b9e09e2299fa9a393d..f98a1c32e0c209473cf7268cbd8245ab entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ()); } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d97319136d6cded2a12cb9ae4f9aa921ff59882c..21bcb811eb002714db7a9be70133bda7a722ba65 100644 +index eb35b18f4875367723ed2e57f19fabca4360ed54..07630fabdc3e824572d7f551f3a876133fc253fe 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -172,6 +172,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0388-Don-t-tick-dead-players.patch b/patches/server/0389-Don-t-tick-dead-players.patch similarity index 91% rename from patches/server/0388-Don-t-tick-dead-players.patch rename to patches/server/0389-Don-t-tick-dead-players.patch index 95d2e787e..157807e58 100644 --- a/patches/server/0388-Don-t-tick-dead-players.patch +++ b/patches/server/0389-Don-t-tick-dead-players.patch @@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else. This is safe because Spectators are skipped in unloaded chunks too in vanilla. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c3ed4358b0cb6f252f9e3f71abe4ec9624cb7694..791aa76cd09b3597f6f1e0d7e302fe9a446ea8e5 100644 +index 9e6d6db0782751895afe345b4d6f586389ec2392..8fc75890eb7342ff9339789434b031ef9a6a5000 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -638,7 +638,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0389-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0390-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0389-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0390-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0390-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/patches/server/0391-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch similarity index 100% rename from patches/server/0390-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch rename to patches/server/0391-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch diff --git a/patches/server/0391-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/patches/server/0392-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch similarity index 100% rename from patches/server/0391-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch rename to patches/server/0392-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch diff --git a/patches/server/0392-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0393-Don-t-move-existing-players-to-world-spawn.patch similarity index 96% rename from patches/server/0392-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0393-Don-t-move-existing-players-to-world-spawn.patch index 2ca582d97..629ecd4cd 100644 --- a/patches/server/0392-Don-t-move-existing-players-to-world-spawn.patch +++ b/patches/server/0393-Don-t-move-existing-players-to-world-spawn.patch @@ -10,7 +10,7 @@ larger than the keep loaded range. By skipping this, we avoid potential for a large spike on server start. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 791aa76cd09b3597f6f1e0d7e302fe9a446ea8e5..a2103ba85e012bbeaf5ecf91db8d5203f576e285 100644 +index 8fc75890eb7342ff9339789434b031ef9a6a5000..58da115a0c2f34c63ae3614acb0d6f8711069e7b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -309,7 +309,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0393-Add-tick-times-API-and-mspt-command.patch b/patches/server/0394-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0393-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0394-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0394-Expose-MinecraftServer-isRunning.patch b/patches/server/0395-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0394-Expose-MinecraftServer-isRunning.patch rename to patches/server/0395-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0395-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0396-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0395-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0396-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0396-Remove-streams-from-Mob-AI-System.patch b/patches/server/0397-Remove-streams-from-Mob-AI-System.patch similarity index 100% rename from patches/server/0396-Remove-streams-from-Mob-AI-System.patch rename to patches/server/0397-Remove-streams-from-Mob-AI-System.patch diff --git a/patches/server/0397-Async-command-map-building.patch b/patches/server/0398-Async-command-map-building.patch similarity index 100% rename from patches/server/0397-Async-command-map-building.patch rename to patches/server/0398-Async-command-map-building.patch diff --git a/patches/server/0398-Improved-Watchdog-Support.patch b/patches/server/0399-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/0398-Improved-Watchdog-Support.patch rename to patches/server/0399-Improved-Watchdog-Support.patch diff --git a/patches/server/0399-Optimize-Pathfinding.patch b/patches/server/0400-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0399-Optimize-Pathfinding.patch rename to patches/server/0400-Optimize-Pathfinding.patch diff --git a/patches/server/0400-Reduce-Either-Optional-allocation.patch b/patches/server/0401-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0400-Reduce-Either-Optional-allocation.patch rename to patches/server/0401-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0401-Remove-streams-from-PairedQueue.patch b/patches/server/0402-Remove-streams-from-PairedQueue.patch similarity index 100% rename from patches/server/0401-Remove-streams-from-PairedQueue.patch rename to patches/server/0402-Remove-streams-from-PairedQueue.patch diff --git a/patches/server/0402-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0403-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0402-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0403-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0403-Prevent-opening-inventories-when-frozen.patch b/patches/server/0404-Prevent-opening-inventories-when-frozen.patch similarity index 97% rename from patches/server/0403-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0404-Prevent-opening-inventories-when-frozen.patch index 2c7b34bab..83b4bcfc7 100644 --- a/patches/server/0403-Prevent-opening-inventories-when-frozen.patch +++ b/patches/server/0404-Prevent-opening-inventories-when-frozen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a2103ba85e012bbeaf5ecf91db8d5203f576e285..d9db660db873bade362ef40aa776293a001564a9 100644 +index 58da115a0c2f34c63ae3614acb0d6f8711069e7b..37fcc83cbaf8e80809c994b18f5a7f3f6d807202 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -609,7 +609,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0404-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0405-Optimise-ArraySetSorted-removeIf.patch similarity index 100% rename from patches/server/0404-Optimise-ArraySetSorted-removeIf.patch rename to patches/server/0405-Optimise-ArraySetSorted-removeIf.patch diff --git a/patches/server/0405-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0406-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0405-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0406-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0406-Restrict-vanilla-teleport-command-to-valid-locations.patch b/patches/server/0407-Restrict-vanilla-teleport-command-to-valid-locations.patch similarity index 100% rename from patches/server/0406-Restrict-vanilla-teleport-command-to-valid-locations.patch rename to patches/server/0407-Restrict-vanilla-teleport-command-to-valid-locations.patch diff --git a/patches/server/0407-Implement-Player-Client-Options-API.patch b/patches/server/0408-Implement-Player-Client-Options-API.patch similarity index 98% rename from patches/server/0407-Implement-Player-Client-Options-API.patch rename to patches/server/0408-Implement-Player-Client-Options-API.patch index ef5eadd09..8496cca27 100644 --- a/patches/server/0407-Implement-Player-Client-Options-API.patch +++ b/patches/server/0408-Implement-Player-Client-Options-API.patch @@ -85,7 +85,7 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d9db660db873bade362ef40aa776293a001564a9..c3aae7bc629b08b8bc1b40973adebfd6aa1edbfd 100644 +index 37fcc83cbaf8e80809c994b18f5a7f3f6d807202..efc6e03e86867665fc655e5a3e0f154af066ef24 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1802,6 +1802,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0408-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0409-Fix-Chunk-Post-Processing-deadlock-risk.patch similarity index 100% rename from patches/server/0408-Fix-Chunk-Post-Processing-deadlock-risk.patch rename to patches/server/0409-Fix-Chunk-Post-Processing-deadlock-risk.patch diff --git a/patches/server/0409-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0410-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0409-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0410-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0410-Broadcast-join-message-to-console.patch b/patches/server/0411-Broadcast-join-message-to-console.patch similarity index 100% rename from patches/server/0410-Broadcast-join-message-to-console.patch rename to patches/server/0411-Broadcast-join-message-to-console.patch diff --git a/patches/server/0411-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0412-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 98% rename from patches/server/0411-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0412-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index 3f471ab0a..fe9800e32 100644 --- a/patches/server/0411-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/patches/server/0412-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -49,7 +49,7 @@ index f651b7d2bbc2fc883bc73ef892de62624d1285e7..6c763b5407425b764839b921f4dc9e18 if (!(entity instanceof EnderDragonPart)) { EntityType entitytypes = entity.getType(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c3aae7bc629b08b8bc1b40973adebfd6aa1edbfd..48f089040dd21342d001b91135ec9128ad5e1027 100644 +index efc6e03e86867665fc655e5a3e0f154af066ef24..488b45d8b8d3c10b72cd0529a494ea408be58c4c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -237,6 +237,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0412-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0413-Load-Chunks-for-Login-Asynchronously.patch similarity index 98% rename from patches/server/0412-Load-Chunks-for-Login-Asynchronously.patch rename to patches/server/0413-Load-Chunks-for-Login-Asynchronously.patch index e5ea65127..66df2681d 100644 --- a/patches/server/0412-Load-Chunks-for-Login-Asynchronously.patch +++ b/patches/server/0413-Load-Chunks-for-Login-Asynchronously.patch @@ -18,7 +18,7 @@ index 60cdb1f5c3f329b417f340f1d2651d89c244e439..3d1c4f8e0db37c6dabece657a17595e7 boolean flag1 = this.chunkMap.promoteChunkMap(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 48f089040dd21342d001b91135ec9128ad5e1027..c083ee1322f86809300fce1552eacd663aaa650d 100644 +index 488b45d8b8d3c10b72cd0529a494ea408be58c4c..61f9eda59684c08884c4a621effb1705db592a53 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -172,6 +172,7 @@ public class ServerPlayer extends Player { @@ -50,7 +50,7 @@ index be677d437d17b74c6188ce1bd5fc6fdc228fd92f..78fbb4c3e52e900956ae0811aaf934c8 public static final TicketType UNKNOWN = TicketType.create("unknown", Comparator.comparingLong(ChunkPos::toLong), 1); public static final TicketType PLUGIN = TicketType.create("plugin", (a, b) -> 0); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fcfd57fd7af655aafb330986e8f6f9cc55819165..1263e845a56e96920c71a7ef636ad3437a70c06f 100644 +index 85a82c8bb98edec526260680ddfbcb36926b97ee..10e4be89803bcdcc8bf7ce64350464c826368ae7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -221,6 +221,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -263,7 +263,7 @@ index 3a13c151066c8784fdc844e1d6310f77ff32e7f1..c4242a1602bbb02541c330bc02016f15 Iterator iterator = list.iterator(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 21bcb811eb002714db7a9be70133bda7a722ba65..326241a4669aa771db9d91ddd205576599110c2d 100644 +index 07630fabdc3e824572d7f551f3a876133fc253fe..e9f7191fefa7c0cf33d56abb7b2a30df261a392c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1491,7 +1491,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0413-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0414-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 93% rename from patches/server/0413-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0414-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch index dd8d0f985..ed7c7447a 100644 --- a/patches/server/0413-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch +++ b/patches/server/0414-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch @@ -7,7 +7,7 @@ The code following this has better support for null worlds to move them back to the world spawn. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 326241a4669aa771db9d91ddd205576599110c2d..62b16f0cedc90af6842c981cf0d8390675fc7201 100644 +index e9f7191fefa7c0cf33d56abb7b2a30df261a392c..250a9b5cd47114aa4743f9695dadec2ad485f99d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1980,9 +1980,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0414-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0415-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0414-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0415-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0415-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/patches/server/0416-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch similarity index 100% rename from patches/server/0415-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch rename to patches/server/0416-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch diff --git a/patches/server/0416-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0417-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0416-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0417-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0417-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0418-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0417-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0418-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0418-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0419-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 97% rename from patches/server/0418-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0419-Fix-numerous-item-duplication-issues-and-teleport-is.patch index 98d85e37e..fe2cca76b 100644 --- a/patches/server/0418-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/patches/server/0419-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the same item twice because the source was destroyed. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 62b16f0cedc90af6842c981cf0d8390675fc7201..a80a1a54a66de45aaf4974be56aecbafeb477825 100644 +index 250a9b5cd47114aa4743f9695dadec2ad485f99d..c6e659cd766facba6411e930d3ae1d2143c2f269 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2126,11 +2126,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -102,7 +102,7 @@ index cb9969d768b13863722aad3dc5daad3c10bb264a..5bfec185e15a54ee5fe6eab1aa59d196 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 98bec353d6dbd85c7b329f75e09f4d0bfcfdaa6c..7d43439a13bd109399691ddec60ee99c818db198 100644 +index 60226f5c408ebd83c958d6644204bfc03365638a..19724497e407c93f738c3bfaec72997dd5fe7ba1 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -807,7 +807,8 @@ public class CraftEventFactory { diff --git a/patches/server/0419-Implement-Brigadier-Mojang-API.patch b/patches/server/0420-Implement-Brigadier-Mojang-API.patch similarity index 98% rename from patches/server/0419-Implement-Brigadier-Mojang-API.patch rename to patches/server/0420-Implement-Brigadier-Mojang-API.patch index c73a8699b..4916e3c24 100644 --- a/patches/server/0419-Implement-Brigadier-Mojang-API.patch +++ b/patches/server/0420-Implement-Brigadier-Mojang-API.patch @@ -10,7 +10,7 @@ Adds CommandRegisteredEvent - Allows manipulating the CommandNode to add more children/metadata for the client diff --git a/build.gradle.kts b/build.gradle.kts -index f0256fe4aea16c9e0d6f5eee360eeec36cfdeebd..2543a4cf2bb58c2265cfc427c427b683d2ff70ca 100644 +index 39ae4cc76438c40e007bfe5e8ace7cbaee66d3b8..23e8666e2b5691eb814af7e06b75c8507f0ed253 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,6 +21,7 @@ repositories { @@ -81,7 +81,7 @@ index 13e358e0eac3bfd426d924b6f745e001df76c64a..7156dea53be828acd01734fa1f9f7b9a event.getPlayer().getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1263e845a56e96920c71a7ef636ad3437a70c06f..fbb33cfa62723ac1fd6f426969e747e49abc8ea6 100644 +index 10e4be89803bcdcc8bf7ce64350464c826368ae7..33dfa5a72974f952a08ef9022b8158629a40a153 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -760,8 +760,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0420-Villager-Restocks-API.patch b/patches/server/0421-Villager-Restocks-API.patch similarity index 94% rename from patches/server/0420-Villager-Restocks-API.patch rename to patches/server/0421-Villager-Restocks-API.patch index 1445794bf..4212655fc 100644 --- a/patches/server/0420-Villager-Restocks-API.patch +++ b/patches/server/0421-Villager-Restocks-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Villager Restocks API diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 9c7cb4f11c429ca5006cf5e178326ead1658581d..fd2a2493fd7c935ab0b2fcd0f5d2b87ef3413af2 100644 +index 426fa33c9e5ddf2de5435859ee4a5f352313869c..124a8eb24bc9428011075925092e99f8159ee1c2 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -127,7 +127,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -18,7 +18,7 @@ index 9c7cb4f11c429ca5006cf5e178326ead1658581d..fd2a2493fd7c935ab0b2fcd0f5d2b87e private boolean assignProfessionWhenSpawned; private static final ImmutableList> MEMORY_TYPES = ImmutableList.of(MemoryModuleType.HOME, MemoryModuleType.JOB_SITE, MemoryModuleType.POTENTIAL_JOB_SITE, MemoryModuleType.MEETING_POINT, MemoryModuleType.NEAREST_LIVING_ENTITIES, MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, MemoryModuleType.VISIBLE_VILLAGER_BABIES, MemoryModuleType.NEAREST_PLAYERS, MemoryModuleType.NEAREST_VISIBLE_PLAYER, MemoryModuleType.NEAREST_VISIBLE_ATTACKABLE_PLAYER, MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, MemoryModuleType.WALK_TARGET, new MemoryModuleType[]{MemoryModuleType.LOOK_TARGET, MemoryModuleType.INTERACTION_TARGET, MemoryModuleType.BREED_TARGET, MemoryModuleType.PATH, MemoryModuleType.DOORS_TO_CLOSE, MemoryModuleType.NEAREST_BED, MemoryModuleType.HURT_BY, MemoryModuleType.HURT_BY_ENTITY, MemoryModuleType.NEAREST_HOSTILE, MemoryModuleType.SECONDARY_JOB_SITE, MemoryModuleType.HIDING_PLACE, MemoryModuleType.HEARD_BELL_TIME, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.LAST_SLEPT, MemoryModuleType.LAST_WOKEN, MemoryModuleType.LAST_WORKED_AT_POI, MemoryModuleType.GOLEM_DETECTED_RECENTLY}); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -index 40815c2500a1b4946c502b8ae7f80c4e93e556ae..115f107ac100524ef0fcf8de0fc528d164c845f7 100644 +index e22453a79371266c3dad450e6c82cb24babcece8..6b16bb1226515b8cbb477e62b617ee1a7f5ef8ed 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java @@ -83,6 +83,18 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { diff --git a/patches/server/0421-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0422-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 95% rename from patches/server/0421-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0422-Validate-PickItem-Packet-and-kick-for-invalid.patch index 348bbe236..197d9443c 100644 --- a/patches/server/0421-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/patches/server/0422-Validate-PickItem-Packet-and-kick-for-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fbb33cfa62723ac1fd6f426969e747e49abc8ea6..b5325f19458467b307db629a00359af41004124a 100644 +index 33dfa5a72974f952a08ef9022b8158629a40a153..1aa260504c9ff022a32ffbb770c8d133bbd68cfc 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -877,7 +877,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0422-Expose-game-version.patch b/patches/server/0423-Expose-game-version.patch similarity index 100% rename from patches/server/0422-Expose-game-version.patch rename to patches/server/0423-Expose-game-version.patch diff --git a/patches/server/0423-Optimize-Voxel-Shape-Merging.patch b/patches/server/0424-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0423-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0424-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0424-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0425-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0424-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0425-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0425-Implement-Mob-Goal-API.patch b/patches/server/0426-Implement-Mob-Goal-API.patch similarity index 99% rename from patches/server/0425-Implement-Mob-Goal-API.patch rename to patches/server/0426-Implement-Mob-Goal-API.patch index dd073b39f..49390dd06 100644 --- a/patches/server/0425-Implement-Mob-Goal-API.patch +++ b/patches/server/0426-Implement-Mob-Goal-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API diff --git a/build.gradle.kts b/build.gradle.kts -index 2543a4cf2bb58c2265cfc427c427b683d2ff70ca..5c885454c729467e29fd3784058fff6a7379c9dc 100644 +index 23e8666e2b5691eb814af7e06b75c8507f0ed253..01989dc93f768165f9de341d9df51355fd5f2727 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,6 +52,7 @@ dependencies { diff --git a/patches/server/0426-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0427-Use-distance-map-to-optimise-entity-tracker.patch similarity index 99% rename from patches/server/0426-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/0427-Use-distance-map-to-optimise-entity-tracker.patch index 0312a5228..1fac56559 100644 --- a/patches/server/0426-Use-distance-map-to-optimise-entity-tracker.patch +++ b/patches/server/0427-Use-distance-map-to-optimise-entity-tracker.patch @@ -312,7 +312,7 @@ index 28afe2f238ded241acf77c3272a44068646b9133..6b492b72b177e3c58580561585609b17 List list = this.entity.getPassengers(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a80a1a54a66de45aaf4974be56aecbafeb477825..11ae525a5d2bd29bfe658d683c53a0ab2626616a 100644 +index c6e659cd766facba6411e930d3ae1d2143c2f269..57d8b712cbdcc1ff082e9313d50dedafa239f50e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -50,6 +50,7 @@ import net.minecraft.network.syncher.EntityDataSerializers; diff --git a/patches/server/0427-Optimize-isOutsideRange-to-use-distance-maps.patch b/patches/server/0428-Optimize-isOutsideRange-to-use-distance-maps.patch similarity index 99% rename from patches/server/0427-Optimize-isOutsideRange-to-use-distance-maps.patch rename to patches/server/0428-Optimize-isOutsideRange-to-use-distance-maps.patch index 297106655..3db66834e 100644 --- a/patches/server/0427-Optimize-isOutsideRange-to-use-distance-maps.patch +++ b/patches/server/0428-Optimize-isOutsideRange-to-use-distance-maps.patch @@ -362,7 +362,7 @@ index 3d1c4f8e0db37c6dabece657a17595e7bf1e3dc2..3faa808f41f057a9956c697ec1323330 if (chunksTicked[0]++ % 10 == 0) this.level.getServer().midTickLoadChunks(); // Paper } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c083ee1322f86809300fce1552eacd663aaa650d..cd34b5aa61c78d8138500a93f0a9714bedd7ed86 100644 +index 61f9eda59684c08884c4a621effb1705db592a53..a01227f1b6d3589a6f56c9289824a1503a32c878 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -244,6 +244,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0428-Add-villager-reputation-API.patch b/patches/server/0429-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0428-Add-villager-reputation-API.patch rename to patches/server/0429-Add-villager-reputation-API.patch diff --git a/patches/server/0429-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0430-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 97% rename from patches/server/0429-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0430-Option-for-maximum-exp-value-when-merging-orbs.patch index 329975a60..c08ccc686 100644 --- a/patches/server/0429-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/patches/server/0430-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -22,7 +22,7 @@ index 16cf7d116e3ffd44ffc4f060b4014b52389cff77..3bc6329d3ea48966cb99e792f9b35e2d private void squidMaxSpawnHeight() { squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 7d43439a13bd109399691ddec60ee99c818db198..36b2faebca20ef152e4fc88ecfa660ecbbb11384 100644 +index 19724497e407c93f738c3bfaec72997dd5fe7ba1..4ad9dae575ea55b422e7b03b7eaf341ac0796d2c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -610,16 +610,30 @@ public class CraftEventFactory { diff --git a/patches/server/0430-ExperienceOrbMergeEvent.patch b/patches/server/0431-ExperienceOrbMergeEvent.patch similarity index 94% rename from patches/server/0430-ExperienceOrbMergeEvent.patch rename to patches/server/0431-ExperienceOrbMergeEvent.patch index 5a91c0f47..1099425eb 100644 --- a/patches/server/0430-ExperienceOrbMergeEvent.patch +++ b/patches/server/0431-ExperienceOrbMergeEvent.patch @@ -9,7 +9,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 36b2faebca20ef152e4fc88ecfa660ecbbb11384..d4b8035160332d98c37918f62ee9e0d630e23ee8 100644 +index 4ad9dae575ea55b422e7b03b7eaf341ac0796d2c..e508f75158423e8c4a59af18a094dfa36b9c180c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -620,7 +620,7 @@ public class CraftEventFactory { diff --git a/patches/server/0431-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0432-Fix-PotionEffect-ignores-icon-flag.patch similarity index 92% rename from patches/server/0431-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0432-Fix-PotionEffect-ignores-icon-flag.patch index 5ed01958b..da67d64ee 100644 --- a/patches/server/0431-Fix-PotionEffect-ignores-icon-flag.patch +++ b/patches/server/0432-Fix-PotionEffect-ignores-icon-flag.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 76e9977f7b2f7fb50631fc56f3318d59d04b1398..a7a6757b83c94a0c0926097021015815f8f18b8e 100644 +index d2e1dbc33d25cd1132b74d50dd9dd746098a4ecc..46fe4779bb894f3beb1f7814dbcc95a7f03b9e5a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -400,7 +400,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0432-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0433-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0432-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0433-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0433-Potential-bed-API.patch b/patches/server/0434-Potential-bed-API.patch similarity index 100% rename from patches/server/0433-Potential-bed-API.patch rename to patches/server/0434-Potential-bed-API.patch diff --git a/patches/server/0434-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0435-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0434-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0435-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0435-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0436-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0435-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0436-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0436-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0437-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0436-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0437-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0437-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0438-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from patches/server/0437-Reduce-MutableInt-allocations-from-light-engine.patch rename to patches/server/0438-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/patches/server/0438-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0439-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0438-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0439-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0439-Ensure-safe-gateway-teleport.patch b/patches/server/0440-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0439-Ensure-safe-gateway-teleport.patch rename to patches/server/0440-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0440-Add-option-for-console-having-all-permissions.patch b/patches/server/0441-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0440-Add-option-for-console-having-all-permissions.patch rename to patches/server/0441-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0441-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/patches/server/0442-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch similarity index 100% rename from patches/server/0441-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch rename to patches/server/0442-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch diff --git a/patches/server/0442-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/patches/server/0443-Optimize-sending-packets-to-nearby-locations-sounds-.patch similarity index 100% rename from patches/server/0442-Optimize-sending-packets-to-nearby-locations-sounds-.patch rename to patches/server/0443-Optimize-sending-packets-to-nearby-locations-sounds-.patch diff --git a/patches/server/0443-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0444-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0443-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0444-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0444-Maps-shouldn-t-load-chunks.patch b/patches/server/0445-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0444-Maps-shouldn-t-load-chunks.patch rename to patches/server/0445-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0445-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0446-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0445-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0446-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0446-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0447-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 100% rename from patches/server/0446-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to patches/server/0447-Delay-Chunk-Unloads-based-on-Player-Movement.patch diff --git a/patches/server/0447-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0448-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0447-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0448-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0448-incremental-chunk-saving.patch b/patches/server/0449-incremental-chunk-saving.patch similarity index 100% rename from patches/server/0448-incremental-chunk-saving.patch rename to patches/server/0449-incremental-chunk-saving.patch diff --git a/patches/server/0449-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0449-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0450-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0451-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0450-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0451-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0451-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0452-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0451-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0452-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0452-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0453-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0452-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0453-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0453-Fix-sand-duping.patch b/patches/server/0454-Fix-sand-duping.patch similarity index 100% rename from patches/server/0453-Fix-sand-duping.patch rename to patches/server/0454-Fix-sand-duping.patch diff --git a/patches/server/0454-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0455-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 94% rename from patches/server/0454-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0455-Prevent-position-desync-in-playerconnection-causing-.patch index 032768e51..e3a18ba40 100644 --- a/patches/server/0454-Prevent-position-desync-in-playerconnection-causing-.patch +++ b/patches/server/0455-Prevent-position-desync-in-playerconnection-causing-.patch @@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside of the move call and into an appropriate place in the tick method. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b5325f19458467b307db629a00359af41004124a..7c9ac85431f8c5a325c94c0e7d1db0315b2d62c1 100644 +index 1aa260504c9ff022a32ffbb770c8d133bbd68cfc..72d8936660f2f6c43e4f6c220b60eef20ac2d055 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1345,6 +1345,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0455-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0456-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0455-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0456-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0456-Expose-Arrow-getItemStack.patch b/patches/server/0457-Expose-Arrow-getItemStack.patch similarity index 100% rename from patches/server/0456-Expose-Arrow-getItemStack.patch rename to patches/server/0457-Expose-Arrow-getItemStack.patch diff --git a/patches/server/0457-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0458-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 95% rename from patches/server/0457-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0458-Add-and-implement-PlayerRecipeBookClickEvent.patch index dd62e3c0f..4d47bb7fc 100644 --- a/patches/server/0457-Add-and-implement-PlayerRecipeBookClickEvent.patch +++ b/patches/server/0458-Add-and-implement-PlayerRecipeBookClickEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7c9ac85431f8c5a325c94c0e7d1db0315b2d62c1..c65f6eda0cff66ae9007e92002075e1f6fd631cd 100644 +index 72d8936660f2f6c43e4f6c220b60eef20ac2d055..8c182e3e4f81a6fc6554e8014e30c0cecf91cf5c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2778,9 +2778,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0458-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0459-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0458-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0459-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0459-Add-permission-for-command-blocks.patch b/patches/server/0460-Add-permission-for-command-blocks.patch similarity index 98% rename from patches/server/0459-Add-permission-for-command-blocks.patch rename to patches/server/0460-Add-permission-for-command-blocks.patch index 65b46313c..da4472b2e 100644 --- a/patches/server/0459-Add-permission-for-command-blocks.patch +++ b/patches/server/0460-Add-permission-for-command-blocks.patch @@ -18,7 +18,7 @@ index f4a056185990181e486f452960159a5287947382..6c55bd8b876d1d694e05ad6de6a9fd29 return false; } else if (this.player.blockActionRestricted((Level) this.level, pos, this.gameModeForPlayer)) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c65f6eda0cff66ae9007e92002075e1f6fd631cd..8193f783cbe7c678632b55f4bc59bc9d7b5756be 100644 +index 8c182e3e4f81a6fc6554e8014e30c0cecf91cf5c..2011ef91d026117be267cc3ea84d49a3288dd9ca 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -788,7 +788,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0460-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0461-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 94% rename from patches/server/0460-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0461-Ensure-Entity-AABB-s-are-never-invalid.patch index 095b8c058..2878f8259 100644 --- a/patches/server/0460-Ensure-Entity-AABB-s-are-never-invalid.patch +++ b/patches/server/0461-Ensure-Entity-AABB-s-are-never-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 11ae525a5d2bd29bfe658d683c53a0ab2626616a..fd0cef886761e71fe331aa60806c186c23ed19bc 100644 +index 57d8b712cbdcc1ff082e9313d50dedafa239f50e..13b6cf4b3d5af77263051a5b17fa2b9da9803596 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -540,7 +540,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0461-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/server/0462-Optimize-WorldBorder-collision-checks-and-air.patch similarity index 97% rename from patches/server/0461-Optimize-WorldBorder-collision-checks-and-air.patch rename to patches/server/0462-Optimize-WorldBorder-collision-checks-and-air.patch index 01936bbbf..6c43f0ba8 100644 --- a/patches/server/0461-Optimize-WorldBorder-collision-checks-and-air.patch +++ b/patches/server/0462-Optimize-WorldBorder-collision-checks-and-air.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize WorldBorder collision checks and air diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index fd0cef886761e71fe331aa60806c186c23ed19bc..96da70f1077f70c4bd5ba1196292a856deb25286 100644 +index 13b6cf4b3d5af77263051a5b17fa2b9da9803596..28f9b58c379306138f1528d91f2112c21ae9cb0a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1024,7 +1024,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0462-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0463-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 98% rename from patches/server/0462-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0463-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index eec5efcc0..6a136884e 100644 --- a/patches/server/0462-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/server/0463-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -63,7 +63,7 @@ index e5f7f043cbdb28d85b8aa0eea7cbaeb584e5fb85..a5c1114f9b323e8a49c84d0e68461e47 @Override diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8193f783cbe7c678632b55f4bc59bc9d7b5756be..39777c2b1bbb12ce3e5be3724235ea0a8072cef8 100644 +index 2011ef91d026117be267cc3ea84d49a3288dd9ca..c4a25ac9aad94c5ef610505db6d7539fa12cd31d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3041,7 +3041,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0463-Paper-dumpitem-command.patch b/patches/server/0464-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0463-Paper-dumpitem-command.patch rename to patches/server/0464-Paper-dumpitem-command.patch diff --git a/patches/server/0464-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0465-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from patches/server/0464-Don-t-allow-null-UUID-s-for-chat.patch rename to patches/server/0465-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/patches/server/0465-Improve-Legacy-Component-serialization-size.patch b/patches/server/0466-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0465-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0466-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0466-Support-old-UUID-format-for-NBT.patch b/patches/server/0467-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0466-Support-old-UUID-format-for-NBT.patch rename to patches/server/0467-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0467-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0468-Clean-up-duplicated-GameProfile-Properties.patch similarity index 96% rename from patches/server/0467-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/server/0468-Clean-up-duplicated-GameProfile-Properties.patch index 495144b4f..811c919be 100644 --- a/patches/server/0467-Clean-up-duplicated-GameProfile-Properties.patch +++ b/patches/server/0468-Clean-up-duplicated-GameProfile-Properties.patch @@ -9,7 +9,7 @@ growing to large sizes and preventing login. This now automatically cleans up the extra properties. diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java -index dc136cd4d5d4ba1e0e53a7187b3a2e836e185c19..1a9435a55e20170244497be70d86d989a4e0f78f 100644 +index 06fe97e05608fc21f90c9884d745d910beb6883d..dca8853944832e8fc5a291aa6b46d84b24181ea7 100644 --- a/src/main/java/net/minecraft/nbt/NbtUtils.java +++ b/src/main/java/net/minecraft/nbt/NbtUtils.java @@ -93,7 +93,8 @@ public final class NbtUtils { diff --git a/patches/server/0468-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0469-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0468-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0469-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0469-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch similarity index 99% rename from patches/server/0469-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch rename to patches/server/0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch index 619abec3d..ed51f630f 100644 --- a/patches/server/0469-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch +++ b/patches/server/0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch @@ -1035,7 +1035,7 @@ index 7ab28e9bd3f785838b7fa4ac5811c0e71cddcb61..d13abec908dbb756272888e9ccdedbef boolean flag1 = this.chunkMap.promoteChunkMap(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index cd34b5aa61c78d8138500a93f0a9714bedd7ed86..b106a972a76e856d6cdab78dec5daef77b135f98 100644 +index a01227f1b6d3589a6f56c9289824a1503a32c878..2bf25f90f760c1a5ee025a0ebaaccd9285a4db7f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -183,6 +183,12 @@ public class ServerPlayer extends Player { @@ -1115,7 +1115,7 @@ index 8770fe0db46b01e8b608637df4f1a669a3f4cdde..3c1698ba0d3bc412ab957777d9b5211d private final String name; private final Comparator comparator; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 39777c2b1bbb12ce3e5be3724235ea0a8072cef8..2b8a9d16add3ac81ede029a909a40feaa07c51d3 100644 +index c4a25ac9aad94c5ef610505db6d7539fa12cd31d..91a06e1ac325fe80aaadaf213d40495f4ce15e53 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1566,6 +1566,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0470-Remove-some-streams-from-structures.patch b/patches/server/0471-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0470-Remove-some-streams-from-structures.patch rename to patches/server/0471-Remove-some-streams-from-structures.patch diff --git a/patches/server/0471-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0472-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0471-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0472-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0472-Support-components-in-ItemMeta.patch b/patches/server/0473-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0472-Support-components-in-ItemMeta.patch rename to patches/server/0473-Support-components-in-ItemMeta.patch diff --git a/patches/server/0473-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0474-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from patches/server/0473-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to patches/server/0474-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/patches/server/0474-Add-entity-liquid-API.patch b/patches/server/0475-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0474-Add-entity-liquid-API.patch rename to patches/server/0475-Add-entity-liquid-API.patch diff --git a/patches/server/0475-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0476-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0475-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0476-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0476-Spawn-player-in-correct-world-on-login.patch b/patches/server/0477-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0476-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0477-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0477-Add-PrepareResultEvent.patch b/patches/server/0478-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0477-Add-PrepareResultEvent.patch rename to patches/server/0478-Add-PrepareResultEvent.patch diff --git a/patches/server/0478-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0479-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0478-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0479-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0479-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0480-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0479-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0480-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0480-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0481-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0480-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0481-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0481-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0482-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0481-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/server/0482-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0482-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0483-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0482-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0483-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0483-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0484-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0483-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0484-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0484-Move-range-check-for-block-placing-up.patch b/patches/server/0485-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0484-Move-range-check-for-block-placing-up.patch rename to patches/server/0485-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0485-Fix-SPIGOT-5989.patch b/patches/server/0486-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0485-Fix-SPIGOT-5989.patch rename to patches/server/0486-Fix-SPIGOT-5989.patch diff --git a/patches/server/0486-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0487-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0486-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0487-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0487-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0488-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0487-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0488-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0488-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0489-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0488-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0489-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0489-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0490-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 100% rename from patches/server/0489-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to patches/server/0490-Add-missing-strikeLighting-call-to-World-spigot-stri.patch diff --git a/patches/server/0490-Fix-some-rails-connecting-improperly.patch b/patches/server/0491-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0490-Fix-some-rails-connecting-improperly.patch rename to patches/server/0491-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0491-Incremental-player-saving.patch b/patches/server/0492-Incremental-player-saving.patch similarity index 100% rename from patches/server/0491-Incremental-player-saving.patch rename to patches/server/0492-Incremental-player-saving.patch diff --git a/patches/server/0492-Fix-MC-187716-Use-configured-height.patch b/patches/server/0493-Fix-MC-187716-Use-configured-height.patch similarity index 100% rename from patches/server/0492-Fix-MC-187716-Use-configured-height.patch rename to patches/server/0493-Fix-MC-187716-Use-configured-height.patch diff --git a/patches/server/0493-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0494-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0493-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0494-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0494-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0495-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0494-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0495-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0495-Brand-support.patch b/patches/server/0496-Brand-support.patch similarity index 100% rename from patches/server/0495-Brand-support.patch rename to patches/server/0496-Brand-support.patch diff --git a/patches/server/0496-Add-setMaxPlayers-API.patch b/patches/server/0497-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0496-Add-setMaxPlayers-API.patch rename to patches/server/0497-Add-setMaxPlayers-API.patch diff --git a/patches/server/0497-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0498-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0497-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0498-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0498-Don-t-require-FACING-data.patch b/patches/server/0499-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0498-Don-t-require-FACING-data.patch rename to patches/server/0499-Don-t-require-FACING-data.patch diff --git a/patches/server/0499-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0500-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0499-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0500-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0500-Add-moon-phase-API.patch b/patches/server/0501-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0500-Add-moon-phase-API.patch rename to patches/server/0501-Add-moon-phase-API.patch diff --git a/patches/server/0501-Prevent-headless-pistons-from-being-created.patch b/patches/server/0502-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0501-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0502-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0502-Add-BellRingEvent.patch b/patches/server/0503-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0502-Add-BellRingEvent.patch rename to patches/server/0503-Add-BellRingEvent.patch diff --git a/patches/server/0503-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0504-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0503-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0504-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0504-Buffer-joins-to-world.patch b/patches/server/0505-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0504-Buffer-joins-to-world.patch rename to patches/server/0505-Buffer-joins-to-world.patch diff --git a/patches/server/0505-Optimize-redstone-algorithm.patch b/patches/server/0506-Optimize-redstone-algorithm.patch similarity index 100% rename from patches/server/0505-Optimize-redstone-algorithm.patch rename to patches/server/0506-Optimize-redstone-algorithm.patch diff --git a/patches/server/0506-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0507-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0506-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0507-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0507-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0508-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0507-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0508-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0508-Fix-CraftTeam-null-check.patch b/patches/server/0509-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0508-Fix-CraftTeam-null-check.patch rename to patches/server/0509-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0509-Add-more-Evoker-API.patch b/patches/server/0510-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0509-Add-more-Evoker-API.patch rename to patches/server/0510-Add-more-Evoker-API.patch diff --git a/patches/server/0510-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/server/0511-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch similarity index 100% rename from patches/server/0510-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch rename to patches/server/0511-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch diff --git a/patches/server/0511-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0512-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0511-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0512-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0512-Cache-block-data-strings.patch b/patches/server/0513-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0512-Cache-block-data-strings.patch rename to patches/server/0513-Cache-block-data-strings.patch diff --git a/patches/server/0513-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0514-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 98% rename from patches/server/0513-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0514-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index 8599c641f..3689035e0 100644 --- a/patches/server/0513-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/server/0514-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -57,7 +57,7 @@ index 0f37c205fe401126a19191fb5382cc1b4d3f43b4..b964efb6afb090ffec505493e9bbbb88 this.setYRot(yaw); this.setXRot(pitch); diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index 68ce2732dfdc25ddadc15c43c30a609f9b1eba86..c741f8e4a4b67d1bfed2d1bac36856c5688bb161 100644 +index a87531f4669c7947e02764b5ceb098385ad99159..9228c0bc797fb95c8ac949bdc568eadafee84a80 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -170,6 +170,7 @@ public abstract class BaseSpawner { diff --git a/patches/server/0514-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0515-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0514-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0515-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0515-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0516-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0515-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0516-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0516-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0517-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0516-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0517-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0517-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0518-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 100% rename from patches/server/0517-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to patches/server/0518-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch diff --git a/patches/server/0518-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0519-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0518-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0519-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0519-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0520-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0519-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0520-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0520-Entity-isTicking.patch b/patches/server/0521-Entity-isTicking.patch similarity index 100% rename from patches/server/0520-Entity-isTicking.patch rename to patches/server/0521-Entity-isTicking.patch diff --git a/patches/server/0521-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0522-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0521-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0522-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0522-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/patches/server/0523-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch similarity index 100% rename from patches/server/0522-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch rename to patches/server/0523-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch diff --git a/patches/server/0523-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0524-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0523-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0524-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0524-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0525-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0524-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0525-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0525-Optimise-getType-calls.patch b/patches/server/0526-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0525-Optimise-getType-calls.patch rename to patches/server/0526-Optimise-getType-calls.patch diff --git a/patches/server/0526-Villager-resetOffers.patch b/patches/server/0527-Villager-resetOffers.patch similarity index 100% rename from patches/server/0526-Villager-resetOffers.patch rename to patches/server/0527-Villager-resetOffers.patch diff --git a/patches/server/0527-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0528-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from patches/server/0527-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to patches/server/0528-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/patches/server/0528-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0529-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0528-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0529-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0529-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0530-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0529-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0530-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0530-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0531-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0530-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0531-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0531-Player-elytra-boost-API.patch b/patches/server/0532-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0531-Player-elytra-boost-API.patch rename to patches/server/0532-Player-elytra-boost-API.patch diff --git a/patches/server/0532-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0533-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0532-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0533-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0533-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0534-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0533-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0534-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0534-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0535-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0534-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0535-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0535-Add-ignore-discounts-API.patch b/patches/server/0536-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0535-Add-ignore-discounts-API.patch rename to patches/server/0536-Add-ignore-discounts-API.patch diff --git a/patches/server/0536-Toggle-for-removing-existing-dragon.patch b/patches/server/0537-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0536-Toggle-for-removing-existing-dragon.patch rename to patches/server/0537-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0537-Fix-client-lag-on-advancement-loading.patch b/patches/server/0538-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0537-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0538-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0538-Item-no-age-no-player-pickup.patch b/patches/server/0539-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0538-Item-no-age-no-player-pickup.patch rename to patches/server/0539-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0539-Beacon-API-custom-effect-ranges.patch b/patches/server/0540-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0539-Beacon-API-custom-effect-ranges.patch rename to patches/server/0540-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0540-Add-API-for-quit-reason.patch b/patches/server/0541-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0540-Add-API-for-quit-reason.patch rename to patches/server/0541-Add-API-for-quit-reason.patch diff --git a/patches/server/0541-Seed-based-feature-search.patch b/patches/server/0542-Seed-based-feature-search.patch similarity index 100% rename from patches/server/0541-Seed-based-feature-search.patch rename to patches/server/0542-Seed-based-feature-search.patch diff --git a/patches/server/0542-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0543-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0542-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0543-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0543-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0544-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0543-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0544-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0544-Expose-world-spawn-angle.patch b/patches/server/0545-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0544-Expose-world-spawn-angle.patch rename to patches/server/0545-Expose-world-spawn-angle.patch diff --git a/patches/server/0545-Add-Destroy-Speed-API.patch b/patches/server/0546-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0545-Add-Destroy-Speed-API.patch rename to patches/server/0546-Add-Destroy-Speed-API.patch diff --git a/patches/server/0546-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0547-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0546-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0547-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0547-Add-LivingEntity-clearActiveItem.patch b/patches/server/0548-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0547-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0548-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0548-Add-PlayerItemCooldownEvent.patch b/patches/server/0549-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0548-Add-PlayerItemCooldownEvent.patch rename to patches/server/0549-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0549-More-lightning-API.patch b/patches/server/0550-More-lightning-API.patch similarity index 100% rename from patches/server/0549-More-lightning-API.patch rename to patches/server/0550-More-lightning-API.patch diff --git a/patches/server/0550-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0551-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0550-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0551-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0551-Added-missing-default-perms-for-commands.patch b/patches/server/0552-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0551-Added-missing-default-perms-for-commands.patch rename to patches/server/0552-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0552-Add-PlayerShearBlockEvent.patch b/patches/server/0553-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0552-Add-PlayerShearBlockEvent.patch rename to patches/server/0553-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0553-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0554-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0553-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0554-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0554-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0555-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0554-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0555-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0555-Limit-recipe-packets.patch b/patches/server/0556-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0555-Limit-recipe-packets.patch rename to patches/server/0556-Limit-recipe-packets.patch diff --git a/patches/server/0556-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0557-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0556-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0557-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0557-MC-4-Fix-item-position-desync.patch b/patches/server/0558-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0557-MC-4-Fix-item-position-desync.patch rename to patches/server/0558-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0558-Player-Chunk-Load-Unload-Events.patch b/patches/server/0559-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0558-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0559-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0559-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0560-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0559-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0560-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0560-Expose-LivingEntity-hurt-direction.patch b/patches/server/0561-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0560-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0561-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0561-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0562-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0561-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0562-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0562-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0563-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0562-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0563-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0563-added-PlayerTradeEvent.patch b/patches/server/0564-added-PlayerTradeEvent.patch similarity index 100% rename from patches/server/0563-added-PlayerTradeEvent.patch rename to patches/server/0564-added-PlayerTradeEvent.patch diff --git a/patches/server/0564-Implement-TargetHitEvent.patch b/patches/server/0565-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0564-Implement-TargetHitEvent.patch rename to patches/server/0565-Implement-TargetHitEvent.patch diff --git a/patches/server/0565-Additional-Block-Material-API-s.patch b/patches/server/0566-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0565-Additional-Block-Material-API-s.patch rename to patches/server/0566-Additional-Block-Material-API-s.patch diff --git a/patches/server/0566-Fix-harming-potion-dupe.patch b/patches/server/0567-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0566-Fix-harming-potion-dupe.patch rename to patches/server/0567-Fix-harming-potion-dupe.patch diff --git a/patches/server/0567-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0568-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0567-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0568-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0568-Cache-burn-durations.patch b/patches/server/0569-Cache-burn-durations.patch similarity index 100% rename from patches/server/0568-Cache-burn-durations.patch rename to patches/server/0569-Cache-burn-durations.patch diff --git a/patches/server/0569-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0570-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0569-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0570-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0570-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0571-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0570-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0571-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0571-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0572-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0571-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0572-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0572-Zombie-API-breaking-doors.patch b/patches/server/0573-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0572-Zombie-API-breaking-doors.patch rename to patches/server/0573-Zombie-API-breaking-doors.patch diff --git a/patches/server/0573-Fix-nerfed-slime-when-splitting.patch b/patches/server/0574-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0573-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0574-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0574-Add-EntityLoadCrossbowEvent.patch b/patches/server/0575-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0574-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0575-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0575-Guardian-beam-workaround.patch b/patches/server/0576-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0575-Guardian-beam-workaround.patch rename to patches/server/0576-Guardian-beam-workaround.patch diff --git a/patches/server/0576-Added-WorldGameRuleChangeEvent.patch b/patches/server/0577-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0576-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0577-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0577-Added-ServerResourcesReloadedEvent.patch b/patches/server/0578-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0577-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0578-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0578-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0579-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0578-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0579-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0579-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0580-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0579-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0580-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0580-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0581-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0580-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0581-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0581-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0582-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0581-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0582-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0582-Configurable-door-breaking-difficulty.patch b/patches/server/0583-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0582-Configurable-door-breaking-difficulty.patch rename to patches/server/0583-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0583-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0584-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0583-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0584-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0584-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0585-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0584-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0585-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0585-Remove-stale-POIs.patch b/patches/server/0586-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0585-Remove-stale-POIs.patch rename to patches/server/0586-Remove-stale-POIs.patch diff --git a/patches/server/0586-Fix-villager-boat-exploit.patch b/patches/server/0587-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0586-Fix-villager-boat-exploit.patch rename to patches/server/0587-Fix-villager-boat-exploit.patch diff --git a/patches/server/0587-Add-sendOpLevel-API.patch b/patches/server/0588-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0587-Add-sendOpLevel-API.patch rename to patches/server/0588-Add-sendOpLevel-API.patch diff --git a/patches/server/0588-Add-StructureLocateEvent.patch b/patches/server/0589-Add-StructureLocateEvent.patch similarity index 100% rename from patches/server/0588-Add-StructureLocateEvent.patch rename to patches/server/0589-Add-StructureLocateEvent.patch diff --git a/patches/server/0589-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0590-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0589-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0590-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0590-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0591-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0590-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0591-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0591-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0592-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0591-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0592-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0592-Make-schedule-command-per-world.patch b/patches/server/0593-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0592-Make-schedule-command-per-world.patch rename to patches/server/0593-Make-schedule-command-per-world.patch diff --git a/patches/server/0593-Configurable-max-leash-distance.patch b/patches/server/0594-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0593-Configurable-max-leash-distance.patch rename to patches/server/0594-Configurable-max-leash-distance.patch diff --git a/patches/server/0594-Implement-BlockPreDispenseEvent.patch b/patches/server/0595-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0594-Implement-BlockPreDispenseEvent.patch rename to patches/server/0595-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0595-Added-Vanilla-Entity-Tags.patch b/patches/server/0596-Added-Vanilla-Entity-Tags.patch similarity index 100% rename from patches/server/0595-Added-Vanilla-Entity-Tags.patch rename to patches/server/0596-Added-Vanilla-Entity-Tags.patch diff --git a/patches/server/0596-added-Wither-API.patch b/patches/server/0597-added-Wither-API.patch similarity index 100% rename from patches/server/0596-added-Wither-API.patch rename to patches/server/0597-added-Wither-API.patch diff --git a/patches/server/0597-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0598-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0597-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0598-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0598-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0599-Fix-console-spam-when-removing-chests-in-water.patch similarity index 100% rename from patches/server/0598-Fix-console-spam-when-removing-chests-in-water.patch rename to patches/server/0599-Fix-console-spam-when-removing-chests-in-water.patch diff --git a/patches/server/0599-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0600-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0599-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0600-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0600-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0601-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0600-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0601-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0601-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0602-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0601-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0602-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0602-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0603-Skip-distance-map-update-when-spawning-disabled.patch similarity index 100% rename from patches/server/0602-Skip-distance-map-update-when-spawning-disabled.patch rename to patches/server/0603-Skip-distance-map-update-when-spawning-disabled.patch diff --git a/patches/server/0603-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0604-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0603-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0604-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0604-add-DragonEggFormEvent.patch b/patches/server/0605-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0604-add-DragonEggFormEvent.patch rename to patches/server/0605-add-DragonEggFormEvent.patch diff --git a/patches/server/0605-EntityMoveEvent.patch b/patches/server/0606-EntityMoveEvent.patch similarity index 100% rename from patches/server/0605-EntityMoveEvent.patch rename to patches/server/0606-EntityMoveEvent.patch diff --git a/patches/server/0606-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0607-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0606-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0607-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0607-Inline-shift-direction-fields.patch b/patches/server/0608-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0607-Inline-shift-direction-fields.patch rename to patches/server/0608-Inline-shift-direction-fields.patch diff --git a/patches/server/0608-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0609-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0608-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0609-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0609-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0610-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0609-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0610-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0610-living-entity-allow-attribute-registration.patch b/patches/server/0611-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0610-living-entity-allow-attribute-registration.patch rename to patches/server/0611-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0611-fix-dead-slime-setSize-invincibility.patch b/patches/server/0612-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0611-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0612-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0612-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0613-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0612-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0613-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0613-misc-debugging-dumps.patch b/patches/server/0614-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0613-misc-debugging-dumps.patch rename to patches/server/0614-misc-debugging-dumps.patch diff --git a/patches/server/0614-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0615-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0614-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0615-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0615-Expose-Tracked-Players.patch b/patches/server/0616-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0615-Expose-Tracked-Players.patch rename to patches/server/0616-Expose-Tracked-Players.patch diff --git a/patches/server/0616-Remove-streams-from-SensorNearest.patch b/patches/server/0617-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0616-Remove-streams-from-SensorNearest.patch rename to patches/server/0617-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0617-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0618-MC-29274-Fix-Wither-hostility-towards-players.patch similarity index 100% rename from patches/server/0617-MC-29274-Fix-Wither-hostility-towards-players.patch rename to patches/server/0618-MC-29274-Fix-Wither-hostility-towards-players.patch diff --git a/patches/server/0618-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0619-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0618-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0619-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0619-Improve-ServerGUI.patch b/patches/server/0620-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0619-Improve-ServerGUI.patch rename to patches/server/0620-Improve-ServerGUI.patch diff --git a/patches/server/0620-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0621-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0620-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0621-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0621-fix-converting-txt-to-json-file.patch b/patches/server/0622-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0621-fix-converting-txt-to-json-file.patch rename to patches/server/0622-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0622-Add-worldborder-events.patch b/patches/server/0623-Add-worldborder-events.patch similarity index 100% rename from patches/server/0622-Add-worldborder-events.patch rename to patches/server/0623-Add-worldborder-events.patch diff --git a/patches/server/0623-added-PlayerNameEntityEvent.patch b/patches/server/0624-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0623-added-PlayerNameEntityEvent.patch rename to patches/server/0624-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0624-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0625-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0624-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0625-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0625-Add-recipe-to-cook-events.patch b/patches/server/0626-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0625-Add-recipe-to-cook-events.patch rename to patches/server/0626-Add-recipe-to-cook-events.patch diff --git a/patches/server/0626-Add-Block-isValidTool.patch b/patches/server/0627-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0626-Add-Block-isValidTool.patch rename to patches/server/0627-Add-Block-isValidTool.patch diff --git a/patches/server/0627-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0628-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0627-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0628-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0628-Implement-Keyed-on-World.patch b/patches/server/0629-Implement-Keyed-on-World.patch similarity index 100% rename from patches/server/0628-Implement-Keyed-on-World.patch rename to patches/server/0629-Implement-Keyed-on-World.patch diff --git a/patches/server/0629-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0630-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0629-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0630-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0630-Item-Rarity-API.patch b/patches/server/0631-Item-Rarity-API.patch similarity index 100% rename from patches/server/0630-Item-Rarity-API.patch rename to patches/server/0631-Item-Rarity-API.patch diff --git a/patches/server/0631-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0632-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0631-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0632-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0632-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0633-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0632-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0633-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0633-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0634-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0633-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0634-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0634-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0635-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0634-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0635-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0635-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0636-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0635-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0636-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0636-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0637-fix-cancelling-block-falling-causing-client-desync.patch similarity index 100% rename from patches/server/0636-fix-cancelling-block-falling-causing-client-desync.patch rename to patches/server/0637-fix-cancelling-block-falling-causing-client-desync.patch diff --git a/patches/server/0637-Expose-protocol-version.patch b/patches/server/0638-Expose-protocol-version.patch similarity index 100% rename from patches/server/0637-Expose-protocol-version.patch rename to patches/server/0638-Expose-protocol-version.patch diff --git a/patches/server/0638-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0639-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 100% rename from patches/server/0638-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/server/0639-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch diff --git a/patches/server/0639-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0640-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0639-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0640-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0640-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0641-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0640-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0641-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0641-Add-bypass-host-check.patch b/patches/server/0642-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0641-Add-bypass-host-check.patch rename to patches/server/0642-Add-bypass-host-check.patch diff --git a/patches/server/0642-Set-area-affect-cloud-rotation.patch b/patches/server/0643-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0642-Set-area-affect-cloud-rotation.patch rename to patches/server/0643-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0643-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0644-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0643-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0644-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0644-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0645-Fix-duplicating-give-items-on-item-drop-cancel.patch similarity index 100% rename from patches/server/0644-Fix-duplicating-give-items-on-item-drop-cancel.patch rename to patches/server/0645-Fix-duplicating-give-items-on-item-drop-cancel.patch diff --git a/patches/server/0645-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0646-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0645-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0646-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0646-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0647-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0646-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0647-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0647-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0648-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0647-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0648-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0648-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0649-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0648-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0649-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0649-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0650-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0649-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0650-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0650-Added-PlayerDeepSleepEvent.patch b/patches/server/0651-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0650-Added-PlayerDeepSleepEvent.patch rename to patches/server/0651-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0651-More-World-API.patch b/patches/server/0652-More-World-API.patch similarity index 100% rename from patches/server/0651-More-World-API.patch rename to patches/server/0652-More-World-API.patch diff --git a/patches/server/0652-Added-PlayerBedFailEnterEvent.patch b/patches/server/0653-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0652-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0653-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0653-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0654-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0653-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0654-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0654-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0655-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0654-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0655-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0655-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0656-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0655-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0656-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0656-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0657-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0656-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0657-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0657-Add-Channel-initialization-listeners.patch b/patches/server/0658-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0657-Add-Channel-initialization-listeners.patch rename to patches/server/0658-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0658-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0659-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0658-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0659-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0659-Add-more-WanderingTrader-API.patch b/patches/server/0660-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0659-Add-more-WanderingTrader-API.patch rename to patches/server/0660-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0660-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0661-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0660-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0661-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0661-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0662-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0661-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0662-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0662-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0663-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0662-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0663-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0663-Inventory-close.patch b/patches/server/0664-Inventory-close.patch similarity index 100% rename from patches/server/0663-Inventory-close.patch rename to patches/server/0664-Inventory-close.patch diff --git a/patches/server/0664-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0665-call-PortalCreateEvent-players-and-end-platform.patch similarity index 100% rename from patches/server/0664-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0665-call-PortalCreateEvent-players-and-end-platform.patch diff --git a/patches/server/0665-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0666-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0665-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0666-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0666-Fix-CraftPotionBrewer-cache.patch b/patches/server/0667-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0666-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0667-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0667-Add-basic-Datapack-API.patch b/patches/server/0668-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0667-Add-basic-Datapack-API.patch rename to patches/server/0668-Add-basic-Datapack-API.patch diff --git a/patches/server/0668-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0669-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0668-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0669-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0669-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0670-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0669-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0670-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0670-ItemStack-repair-check-API.patch b/patches/server/0671-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0670-ItemStack-repair-check-API.patch rename to patches/server/0671-ItemStack-repair-check-API.patch diff --git a/patches/server/0671-More-Enchantment-API.patch b/patches/server/0672-More-Enchantment-API.patch similarity index 100% rename from patches/server/0671-More-Enchantment-API.patch rename to patches/server/0672-More-Enchantment-API.patch diff --git a/patches/server/0672-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0673-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/0672-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/server/0673-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/0673-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0674-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0673-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0674-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0674-Add-Mob-lookAt-API.patch b/patches/server/0675-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0674-Add-Mob-lookAt-API.patch rename to patches/server/0675-Add-Mob-lookAt-API.patch diff --git a/patches/server/0675-Add-Unix-domain-socket-support.patch b/patches/server/0676-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0675-Add-Unix-domain-socket-support.patch rename to patches/server/0676-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0676-Add-EntityInsideBlockEvent.patch b/patches/server/0677-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0676-Add-EntityInsideBlockEvent.patch rename to patches/server/0677-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0677-Attributes-API-for-item-defaults.patch b/patches/server/0678-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0677-Attributes-API-for-item-defaults.patch rename to patches/server/0678-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0678-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0679-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0678-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch rename to patches/server/0679-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch diff --git a/patches/server/0679-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0680-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0679-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0680-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0680-More-Lidded-Block-API.patch b/patches/server/0681-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0680-More-Lidded-Block-API.patch rename to patches/server/0681-More-Lidded-Block-API.patch diff --git a/patches/server/0681-Limit-item-frame-cursors-on-maps.patch b/patches/server/0682-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0681-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0682-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0682-Add-PufferFishStateChangeEvent.patch b/patches/server/0683-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0682-Add-PufferFishStateChangeEvent.patch rename to patches/server/0683-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0683-Add-PlayerKickEvent-causes.patch b/patches/server/0684-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0683-Add-PlayerKickEvent-causes.patch rename to patches/server/0684-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0684-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0685-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0684-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0685-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0684-Synchronize-PalettedContainer-instead-of-ReentrantLoc.patch b/patches/server/0686-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch similarity index 100% rename from patches/server/0684-Synchronize-PalettedContainer-instead-of-ReentrantLoc.patch rename to patches/server/0686-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch diff --git a/patches/server/0685-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0687-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0685-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0687-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0686-Add-BellRevealRaiderEvent.patch b/patches/server/0688-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0686-Add-BellRevealRaiderEvent.patch rename to patches/server/0688-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0687-Fix-invulnerable-end-crystals.patch b/patches/server/0689-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0687-Fix-invulnerable-end-crystals.patch rename to patches/server/0689-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0688-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0690-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0688-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0690-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0689-Reset-villager-inventory-on-cancelled-pickup-event.patch b/patches/server/0691-Reset-villager-inventory-on-cancelled-pickup-event.patch similarity index 100% rename from patches/server/0689-Reset-villager-inventory-on-cancelled-pickup-event.patch rename to patches/server/0691-Reset-villager-inventory-on-cancelled-pickup-event.patch diff --git a/patches/server/0690-Fix-dangerous-end-portal-logic.patch b/patches/server/0692-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0690-Fix-dangerous-end-portal-logic.patch rename to patches/server/0692-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0690-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0693-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0690-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0693-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0691-Make-item-validations-configurable.patch b/patches/server/0694-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0691-Make-item-validations-configurable.patch rename to patches/server/0694-Make-item-validations-configurable.patch diff --git a/patches/server/0692-Add-more-line-of-sight-methods.patch b/patches/server/0695-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/server/0692-Add-more-line-of-sight-methods.patch rename to patches/server/0695-Add-more-line-of-sight-methods.patch diff --git a/patches/server/0693-add-per-world-spawn-limits.patch b/patches/server/0696-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0693-add-per-world-spawn-limits.patch rename to patches/server/0696-add-per-world-spawn-limits.patch diff --git a/patches/server/0694-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0697-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0694-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0697-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0694-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0698-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch similarity index 100% rename from patches/server/0694-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch rename to patches/server/0698-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch