diff --git a/patches/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/api/0201-Improve-Arrow-API.patch b/patches/api/0201-Improve-Arrow-API.patch deleted file mode 100644 index 1c70418e98..0000000000 --- a/patches/api/0201-Improve-Arrow-API.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nesaak <52047222+Nesaak@users.noreply.github.com> -Date: Fri, 22 May 2020 13:35:21 -0400 -Subject: [PATCH] Improve Arrow API - -Add method to get the arrow's itemstack and a method -to set the arrow's "noclip" status - -Co-authored-by: Jake Potrebic - -diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java -index e8e56e89e32d84af0639fe2e9b0eeabd747b6007..225a24898acd25038ea2a8448f9f3b57643d3026 100644 ---- a/src/main/java/org/bukkit/entity/AbstractArrow.java -+++ b/src/main/java/org/bukkit/entity/AbstractArrow.java -@@ -143,6 +143,28 @@ public interface AbstractArrow extends Projectile { - } - - // Paper start -+ /** -+ * Gets the ItemStack for this arrow. -+ * -+ * @return The ItemStack, as if a player picked up the arrow -+ */ -+ @NotNull -+ org.bukkit.inventory.ItemStack getItemStack(); -+ -+ /** -+ * Sets this arrow to "noclip" status. -+ * -+ * @param noPhysics true to set "noclip" -+ */ -+ void setNoPhysics(boolean noPhysics); -+ -+ /** -+ * Gets if this arrow has "noclip". -+ * -+ * @return true if noclip is active -+ */ -+ boolean hasNoPhysics(); -+ - /** - * Gets the {@link PickupRule} for this arrow. - * diff --git a/patches/api/0203-Support-components-in-ItemMeta.patch b/patches/api/0202-Support-components-in-ItemMeta.patch similarity index 96% rename from patches/api/0203-Support-components-in-ItemMeta.patch rename to patches/api/0202-Support-components-in-ItemMeta.patch index 00f7942262..dc804cc5b2 100644 --- a/patches/api/0203-Support-components-in-ItemMeta.patch +++ b/patches/api/0202-Support-components-in-ItemMeta.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 420a91a834016d3af95efd79ca92ae45c4f081c4..ea64d5b1ebaa652785ddbc7b515808174f636a62 100644 +index f23c0c942f200a68d2620f225ab90399a9057dfc..478b6d2acbc5788f72db81f387daa08df7837a5d 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -5,6 +5,7 @@ import java.util.Collection; diff --git a/patches/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch similarity index 100% rename from patches/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch rename to patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch diff --git a/patches/api/0205-Add-entity-liquid-API.patch b/patches/api/0204-Add-entity-liquid-API.patch similarity index 100% rename from patches/api/0205-Add-entity-liquid-API.patch rename to patches/api/0204-Add-entity-liquid-API.patch diff --git a/patches/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch similarity index 100% rename from patches/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch rename to patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch diff --git a/patches/api/0207-Add-BellRingEvent.patch b/patches/api/0206-Add-BellRingEvent.patch similarity index 100% rename from patches/api/0207-Add-BellRingEvent.patch rename to patches/api/0206-Add-BellRingEvent.patch diff --git a/patches/api/0208-Brand-support.patch b/patches/api/0207-Brand-support.patch similarity index 100% rename from patches/api/0208-Brand-support.patch rename to patches/api/0207-Brand-support.patch diff --git a/patches/api/0209-Add-moon-phase-API.patch b/patches/api/0208-Add-moon-phase-API.patch similarity index 100% rename from patches/api/0209-Add-moon-phase-API.patch rename to patches/api/0208-Add-moon-phase-API.patch diff --git a/patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 93% rename from patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch index 2db07bbf4c..cc0b04bb45 100644 --- a/patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 3f062e0fe9cb632dece9ce3fdc985ab1bf5a425f..590d69f57722a40addf73131fa60e952f303230b 100644 +index 10d76fcd509702042c528fab96b963e9c6d210a5..3969f3c188211838cb576465bd64c0f63ae85080 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1045,5 +1045,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0211-Add-more-Evoker-API.patch b/patches/api/0210-Add-more-Evoker-API.patch similarity index 100% rename from patches/api/0211-Add-more-Evoker-API.patch rename to patches/api/0210-Add-more-Evoker-API.patch diff --git a/patches/api/0212-Add-methods-to-get-translation-keys.patch b/patches/api/0211-Add-methods-to-get-translation-keys.patch similarity index 99% rename from patches/api/0212-Add-methods-to-get-translation-keys.patch rename to patches/api/0211-Add-methods-to-get-translation-keys.patch index f203ee5d2c..5af19e4030 100644 --- a/patches/api/0212-Add-methods-to-get-translation-keys.patch +++ b/patches/api/0211-Add-methods-to-get-translation-keys.patch @@ -282,7 +282,7 @@ index d3087d60378822cdd7cea25fd63d3f496e3cd2fb..5d8fa5b39a5d50cca48ba63af3a84b80 + // Paper end } diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index a7c58adb6404e04a673bf91d491d7fef56dc890e..85a5e9a3b41798cb3cb6687ed379a5e3eedd698a 100644 +index bf29d9b733afc7c62725d259f4920c4f211cc6d0..1d3812db989a55b6f31bb30dffe70323eb592a15 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0212-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/api/0212-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/api/0214-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0213-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/api/0214-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/api/0213-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/api/0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/api/0216-Entity-isTicking.patch b/patches/api/0215-Entity-isTicking.patch similarity index 100% rename from patches/api/0216-Entity-isTicking.patch rename to patches/api/0215-Entity-isTicking.patch diff --git a/patches/api/0217-Villager-resetOffers.patch b/patches/api/0216-Villager-resetOffers.patch similarity index 100% rename from patches/api/0217-Villager-resetOffers.patch rename to patches/api/0216-Villager-resetOffers.patch diff --git a/patches/api/0218-Player-elytra-boost-API.patch b/patches/api/0217-Player-elytra-boost-API.patch similarity index 100% rename from patches/api/0218-Player-elytra-boost-API.patch rename to patches/api/0217-Player-elytra-boost-API.patch diff --git a/patches/api/0219-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/api/0219-Add-getOfflinePlayerIfCached-String.patch rename to patches/api/0218-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/api/0220-Add-ignore-discounts-API.patch b/patches/api/0219-Add-ignore-discounts-API.patch similarity index 100% rename from patches/api/0220-Add-ignore-discounts-API.patch rename to patches/api/0219-Add-ignore-discounts-API.patch diff --git a/patches/api/0221-Item-no-age-no-player-pickup.patch b/patches/api/0220-Item-no-age-no-player-pickup.patch similarity index 93% rename from patches/api/0221-Item-no-age-no-player-pickup.patch rename to patches/api/0220-Item-no-age-no-player-pickup.patch index 5dd7572120..d3be2301af 100644 --- a/patches/api/0221-Item-no-age-no-player-pickup.patch +++ b/patches/api/0220-Item-no-age-no-player-pickup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Item no age & no player pickup diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java -index ab06c640cef1309ab44b0fae8d95df48cdc869a7..48858e1c58c13d786bbc935abedb0f059837833c 100644 +index bfecd0633458586c0352eeb1a95bb57b12f9101e..6239aec4f6c625a814fa4fd610cdc5ab1a9f6e0f 100644 --- a/src/main/java/org/bukkit/entity/Item.java +++ b/src/main/java/org/bukkit/entity/Item.java @@ -104,5 +104,34 @@ public interface Item extends Entity { diff --git a/patches/api/0222-Beacon-API-custom-effect-ranges.patch b/patches/api/0221-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/api/0222-Beacon-API-custom-effect-ranges.patch rename to patches/api/0221-Beacon-API-custom-effect-ranges.patch diff --git a/patches/api/0223-Add-API-for-quit-reason.patch b/patches/api/0222-Add-API-for-quit-reason.patch similarity index 100% rename from patches/api/0223-Add-API-for-quit-reason.patch rename to patches/api/0222-Add-API-for-quit-reason.patch diff --git a/patches/api/0224-Add-Destroy-Speed-API.patch b/patches/api/0223-Add-Destroy-Speed-API.patch similarity index 97% rename from patches/api/0224-Add-Destroy-Speed-API.patch rename to patches/api/0223-Add-Destroy-Speed-API.patch index d3bcb47524..cdf304d00b 100644 --- a/patches/api/0224-Add-Destroy-Speed-API.patch +++ b/patches/api/0223-Add-Destroy-Speed-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add Destroy Speed API Co-authored-by: Jake Potrebic diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 85a5e9a3b41798cb3cb6687ed379a5e3eedd698a..c1705e518af08841e8154caf183bc808366feb2e 100644 +index 1d3812db989a55b6f31bb30dffe70323eb592a15..4aea4be0677d93e17a4ce98dd340dd9921f996a0 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -690,4 +690,31 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr diff --git a/patches/api/0225-Add-LivingEntity-clearActiveItem.patch b/patches/api/0224-Add-LivingEntity-clearActiveItem.patch similarity index 90% rename from patches/api/0225-Add-LivingEntity-clearActiveItem.patch rename to patches/api/0224-Add-LivingEntity-clearActiveItem.patch index efb08addcb..aa60fb7335 100644 --- a/patches/api/0225-Add-LivingEntity-clearActiveItem.patch +++ b/patches/api/0224-Add-LivingEntity-clearActiveItem.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 590d69f57722a40addf73131fa60e952f303230b..191a3c3ee46649d2a539597258485752b34fac02 100644 +index 3969f3c188211838cb576465bd64c0f63ae85080..9d58da4686a22893455b9cc75fb8e73a87d2d06d 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -996,6 +996,13 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0226-Add-PlayerItemCooldownEvent.patch b/patches/api/0225-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/api/0226-Add-PlayerItemCooldownEvent.patch rename to patches/api/0225-Add-PlayerItemCooldownEvent.patch diff --git a/patches/api/0227-More-lightning-API.patch b/patches/api/0226-More-lightning-API.patch similarity index 100% rename from patches/api/0227-More-lightning-API.patch rename to patches/api/0226-More-lightning-API.patch diff --git a/patches/api/0228-Add-PlayerShearBlockEvent.patch b/patches/api/0227-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/api/0228-Add-PlayerShearBlockEvent.patch rename to patches/api/0227-Add-PlayerShearBlockEvent.patch diff --git a/patches/api/0229-Player-Chunk-Load-Unload-Events.patch b/patches/api/0228-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/api/0229-Player-Chunk-Load-Unload-Events.patch rename to patches/api/0228-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/api/0230-Expose-LivingEntity-hurt-direction.patch b/patches/api/0229-Expose-LivingEntity-hurt-direction.patch similarity index 95% rename from patches/api/0230-Expose-LivingEntity-hurt-direction.patch rename to patches/api/0229-Expose-LivingEntity-hurt-direction.patch index 948b10631f..e99a7ce6bb 100644 --- a/patches/api/0230-Expose-LivingEntity-hurt-direction.patch +++ b/patches/api/0229-Expose-LivingEntity-hurt-direction.patch @@ -26,7 +26,7 @@ index 94f2c3167f4ce7f5f2b4ecc067739c64af0a2508..4054d2c836342f0e4bcbd33adb13f50d * Get the sleep ticks of the player. This value may be capped. * diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 191a3c3ee46649d2a539597258485752b34fac02..62d0d2fe3c6dfc9faaa821bde074b623914e4a44 100644 +index 9d58da4686a22893455b9cc75fb8e73a87d2d06d..e9919fce380ec1d0d48b3ac706e7fd31af0be26b 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1075,5 +1075,21 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0230-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/api/0230-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/api/0232-Added-PlayerTradeEvent.patch b/patches/api/0231-Added-PlayerTradeEvent.patch similarity index 100% rename from patches/api/0232-Added-PlayerTradeEvent.patch rename to patches/api/0231-Added-PlayerTradeEvent.patch diff --git a/patches/api/0233-Add-TargetHitEvent-API.patch b/patches/api/0232-Add-TargetHitEvent-API.patch similarity index 100% rename from patches/api/0233-Add-TargetHitEvent-API.patch rename to patches/api/0232-Add-TargetHitEvent-API.patch diff --git a/patches/api/0234-Additional-Block-Material-API-s.patch b/patches/api/0233-Additional-Block-Material-API-s.patch similarity index 95% rename from patches/api/0234-Additional-Block-Material-API-s.patch rename to patches/api/0233-Additional-Block-Material-API-s.patch index f20f4d9d39..ab3e6f9ac6 100644 --- a/patches/api/0234-Additional-Block-Material-API-s.patch +++ b/patches/api/0233-Additional-Block-Material-API-s.patch @@ -9,7 +9,7 @@ process to do this in the Bukkit API Adds API for buildable, replaceable, burnable too. diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 137a40c708bb67de4608447975867a07240ddc88..3fd364e5875f95296e75dede4c610d3dd3e0038e 100644 +index 4aea4be0677d93e17a4ce98dd340dd9921f996a0..c68ed7de2d50da4105dd38c0986f237e8c56b2d6 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -439,6 +439,42 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr diff --git a/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0234-Add-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/api/0234-Add-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/api/0236-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0235-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/api/0236-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/api/0235-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/api/0237-Zombie-API-breaking-doors.patch b/patches/api/0236-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/api/0237-Zombie-API-breaking-doors.patch rename to patches/api/0236-Zombie-API-breaking-doors.patch diff --git a/patches/api/0238-Add-EntityLoadCrossbowEvent.patch b/patches/api/0237-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/api/0238-Add-EntityLoadCrossbowEvent.patch rename to patches/api/0237-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/api/0239-Added-WorldGameRuleChangeEvent.patch b/patches/api/0238-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/api/0239-Added-WorldGameRuleChangeEvent.patch rename to patches/api/0238-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/api/0240-Added-ServerResourcesReloadedEvent.patch b/patches/api/0239-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/api/0240-Added-ServerResourcesReloadedEvent.patch rename to patches/api/0239-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/api/0241-Add-BlockFailedDispenseEvent.patch b/patches/api/0240-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/api/0241-Add-BlockFailedDispenseEvent.patch rename to patches/api/0240-Add-BlockFailedDispenseEvent.patch diff --git a/patches/api/0242-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0241-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/api/0242-Added-PlayerLecternPageChangeEvent.patch rename to patches/api/0241-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/api/0243-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0242-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/api/0243-Added-PlayerLoomPatternSelectEvent.patch rename to patches/api/0242-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch similarity index 100% rename from patches/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch rename to patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch diff --git a/patches/api/0245-Add-sendOpLevel-API.patch b/patches/api/0244-Add-sendOpLevel-API.patch similarity index 100% rename from patches/api/0245-Add-sendOpLevel-API.patch rename to patches/api/0244-Add-sendOpLevel-API.patch diff --git a/patches/api/0246-Add-PaperRegistry.patch b/patches/api/0245-Add-PaperRegistry.patch similarity index 100% rename from patches/api/0246-Add-PaperRegistry.patch rename to patches/api/0245-Add-PaperRegistry.patch diff --git a/patches/api/0247-Add-StructuresLocateEvent.patch b/patches/api/0246-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/api/0247-Add-StructuresLocateEvent.patch rename to patches/api/0246-Add-StructuresLocateEvent.patch diff --git a/patches/api/0248-Add-BlockPreDispenseEvent.patch b/patches/api/0247-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/api/0248-Add-BlockPreDispenseEvent.patch rename to patches/api/0247-Add-BlockPreDispenseEvent.patch diff --git a/patches/api/0249-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0248-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/api/0249-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/api/0248-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/api/0250-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0249-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/api/0250-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/api/0249-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/api/0251-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0250-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/api/0251-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/api/0250-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/api/0252-add-DragonEggFormEvent.patch b/patches/api/0251-add-DragonEggFormEvent.patch similarity index 100% rename from patches/api/0252-add-DragonEggFormEvent.patch rename to patches/api/0251-add-DragonEggFormEvent.patch diff --git a/patches/api/0253-EntityMoveEvent.patch b/patches/api/0252-EntityMoveEvent.patch similarity index 100% rename from patches/api/0253-EntityMoveEvent.patch rename to patches/api/0252-EntityMoveEvent.patch diff --git a/patches/api/0254-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0253-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/api/0254-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/api/0253-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/api/0255-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0254-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/api/0255-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/api/0254-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/api/0256-living-entity-allow-attribute-registration.patch b/patches/api/0255-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/api/0256-living-entity-allow-attribute-registration.patch rename to patches/api/0255-living-entity-allow-attribute-registration.patch diff --git a/patches/api/0257-Add-missing-effects.patch b/patches/api/0256-Add-missing-effects.patch similarity index 100% rename from patches/api/0257-Add-missing-effects.patch rename to patches/api/0256-Add-missing-effects.patch diff --git a/patches/api/0258-Expose-Tracked-Players.patch b/patches/api/0257-Expose-Tracked-Players.patch similarity index 100% rename from patches/api/0258-Expose-Tracked-Players.patch rename to patches/api/0257-Expose-Tracked-Players.patch diff --git a/patches/api/0259-Cache-the-result-of-Material-isBlock.patch b/patches/api/0258-Cache-the-result-of-Material-isBlock.patch similarity index 100% rename from patches/api/0259-Cache-the-result-of-Material-isBlock.patch rename to patches/api/0258-Cache-the-result-of-Material-isBlock.patch diff --git a/patches/api/0260-Add-worldborder-events.patch b/patches/api/0259-Add-worldborder-events.patch similarity index 100% rename from patches/api/0260-Add-worldborder-events.patch rename to patches/api/0259-Add-worldborder-events.patch diff --git a/patches/api/0261-added-PlayerNameEntityEvent.patch b/patches/api/0260-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/api/0261-added-PlayerNameEntityEvent.patch rename to patches/api/0260-added-PlayerNameEntityEvent.patch diff --git a/patches/api/0262-Add-recipe-to-cook-events.patch b/patches/api/0261-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/api/0262-Add-recipe-to-cook-events.patch rename to patches/api/0261-Add-recipe-to-cook-events.patch diff --git a/patches/api/0263-Add-Block-isValidTool.patch b/patches/api/0262-Add-Block-isValidTool.patch similarity index 100% rename from patches/api/0263-Add-Block-isValidTool.patch rename to patches/api/0262-Add-Block-isValidTool.patch diff --git a/patches/api/0264-Expand-world-key-API.patch b/patches/api/0263-Expand-world-key-API.patch similarity index 100% rename from patches/api/0264-Expand-world-key-API.patch rename to patches/api/0263-Expand-world-key-API.patch diff --git a/patches/api/0265-Item-Rarity-API.patch b/patches/api/0264-Item-Rarity-API.patch similarity index 100% rename from patches/api/0265-Item-Rarity-API.patch rename to patches/api/0264-Item-Rarity-API.patch diff --git a/patches/api/0266-Expose-protocol-version.patch b/patches/api/0265-Expose-protocol-version.patch similarity index 100% rename from patches/api/0266-Expose-protocol-version.patch rename to patches/api/0265-Expose-protocol-version.patch diff --git a/patches/api/0267-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0266-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/api/0267-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/api/0266-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/api/0268-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0267-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/api/0268-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/api/0267-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/api/0269-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0268-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/api/0269-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/api/0268-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/api/0270-Added-PlayerDeepSleepEvent.patch b/patches/api/0269-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/api/0270-Added-PlayerDeepSleepEvent.patch rename to patches/api/0269-Added-PlayerDeepSleepEvent.patch diff --git a/patches/api/0271-More-World-API.patch b/patches/api/0270-More-World-API.patch similarity index 100% rename from patches/api/0271-More-World-API.patch rename to patches/api/0270-More-World-API.patch diff --git a/patches/api/0272-Added-PlayerBedFailEnterEvent.patch b/patches/api/0271-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/api/0272-Added-PlayerBedFailEnterEvent.patch rename to patches/api/0271-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/api/0273-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0272-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/api/0273-Introduce-beacon-activation-deactivation-events.patch rename to patches/api/0272-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/api/0274-PlayerMoveEvent-Improvements.patch b/patches/api/0273-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/api/0274-PlayerMoveEvent-Improvements.patch rename to patches/api/0273-PlayerMoveEvent-Improvements.patch diff --git a/patches/api/0275-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0274-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/api/0275-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/api/0274-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/api/0276-Add-more-WanderingTrader-API.patch b/patches/api/0275-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/api/0276-Add-more-WanderingTrader-API.patch rename to patches/api/0275-Add-more-WanderingTrader-API.patch diff --git a/patches/api/0277-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0276-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/api/0277-Add-EntityBlockStorage-clearEntities.patch rename to patches/api/0276-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/api/0278-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0277-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/api/0278-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/api/0277-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/api/0279-Inventory-close.patch b/patches/api/0278-Inventory-close.patch similarity index 100% rename from patches/api/0279-Inventory-close.patch rename to patches/api/0278-Inventory-close.patch diff --git a/patches/api/0280-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0279-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/api/0280-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/api/0279-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/api/0281-Add-basic-Datapack-API.patch b/patches/api/0280-Add-basic-Datapack-API.patch similarity index 100% rename from patches/api/0281-Add-basic-Datapack-API.patch rename to patches/api/0280-Add-basic-Datapack-API.patch diff --git a/patches/api/0282-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0281-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/api/0282-additions-to-PlayerGameModeChangeEvent.patch rename to patches/api/0281-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/api/0283-ItemStack-repair-check-API.patch b/patches/api/0282-ItemStack-repair-check-API.patch similarity index 100% rename from patches/api/0283-ItemStack-repair-check-API.patch rename to patches/api/0282-ItemStack-repair-check-API.patch diff --git a/patches/api/0284-More-Enchantment-API.patch b/patches/api/0283-More-Enchantment-API.patch similarity index 100% rename from patches/api/0284-More-Enchantment-API.patch rename to patches/api/0283-More-Enchantment-API.patch diff --git a/patches/api/0285-Add-Mob-lookAt-API.patch b/patches/api/0284-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/api/0285-Add-Mob-lookAt-API.patch rename to patches/api/0284-Add-Mob-lookAt-API.patch diff --git a/patches/api/0286-ItemStack-editMeta.patch b/patches/api/0285-ItemStack-editMeta.patch similarity index 100% rename from patches/api/0286-ItemStack-editMeta.patch rename to patches/api/0285-ItemStack-editMeta.patch diff --git a/patches/api/0287-Add-EntityInsideBlockEvent.patch b/patches/api/0286-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/api/0287-Add-EntityInsideBlockEvent.patch rename to patches/api/0286-Add-EntityInsideBlockEvent.patch diff --git a/patches/api/0288-Attributes-API-for-item-defaults.patch b/patches/api/0287-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/api/0288-Attributes-API-for-item-defaults.patch rename to patches/api/0287-Attributes-API-for-item-defaults.patch diff --git a/patches/api/0289-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0288-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/api/0289-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/api/0288-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/api/0290-More-Lidded-Block-API.patch b/patches/api/0289-More-Lidded-Block-API.patch similarity index 100% rename from patches/api/0290-More-Lidded-Block-API.patch rename to patches/api/0289-More-Lidded-Block-API.patch diff --git a/patches/api/0291-Add-PlayerKickEvent-causes.patch b/patches/api/0290-Add-PlayerKickEvent-causes.patch similarity index 97% rename from patches/api/0291-Add-PlayerKickEvent-causes.patch rename to patches/api/0290-Add-PlayerKickEvent-causes.patch index 39657e4039..b23128c57d 100644 --- a/patches/api/0291-Add-PlayerKickEvent-causes.patch +++ b/patches/api/0290-Add-PlayerKickEvent-causes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 59821aba66edbef2644bdd21646f556e773a898b..793df7533096efb0f60bddcb3e4e1575cbcc1069 100644 +index d735ed635022d170c6b1080ed87f3c2a799202f6..4906bec154d0f60420fbe2cffa8c7df0918ca61b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -277,6 +277,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0292-Add-PufferFishStateChangeEvent.patch b/patches/api/0291-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/api/0292-Add-PufferFishStateChangeEvent.patch rename to patches/api/0291-Add-PufferFishStateChangeEvent.patch diff --git a/patches/api/0293-Add-BellRevealRaiderEvent.patch b/patches/api/0292-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/api/0293-Add-BellRevealRaiderEvent.patch rename to patches/api/0292-Add-BellRevealRaiderEvent.patch diff --git a/patches/api/0294-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0293-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/api/0294-Add-ElderGuardianAppearanceEvent.patch rename to patches/api/0293-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/api/0295-Add-more-line-of-sight-methods.patch b/patches/api/0294-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/api/0295-Add-more-line-of-sight-methods.patch rename to patches/api/0294-Add-more-line-of-sight-methods.patch diff --git a/patches/api/0296-Add-WaterBottleSplashEvent.patch b/patches/api/0295-Add-WaterBottleSplashEvent.patch similarity index 100% rename from patches/api/0296-Add-WaterBottleSplashEvent.patch rename to patches/api/0295-Add-WaterBottleSplashEvent.patch diff --git a/patches/api/0297-Add-more-LimitedRegion-API.patch b/patches/api/0296-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/api/0297-Add-more-LimitedRegion-API.patch rename to patches/api/0296-Add-more-LimitedRegion-API.patch diff --git a/patches/api/0298-Missing-Entity-API.patch b/patches/api/0297-Missing-Entity-API.patch similarity index 98% rename from patches/api/0298-Missing-Entity-API.patch rename to patches/api/0297-Missing-Entity-API.patch index 1a3f1b5e63..f9455519bb 100644 --- a/patches/api/0298-Missing-Entity-API.patch +++ b/patches/api/0297-Missing-Entity-API.patch @@ -11,6 +11,7 @@ Co-authored-by: booky10 Co-authored-by: Amin Co-authored-by: TrollyLoki Co-authored-by: FireInstall +Co-authored-by: maxcom1 <46265094+maxcom1@users.noreply.github.com> diff --git a/src/main/java/io/papermc/paper/entity/SchoolableFish.java b/src/main/java/io/papermc/paper/entity/SchoolableFish.java new file mode 100644 @@ -416,14 +417,14 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..138d2530de2410f4a9424dabd3e5ce0c + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index d68ccecaadcf7a906058e66a750f4cfce5dd7b3f..efe812b4d47df6f8b5ba54ec4526f3dcd20f180f 100644 +index d68ccecaadcf7a906058e66a750f4cfce5dd7b3f..578c22b0aef9c89a3c33b75c33bcdc60bdab6b49 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -283,6 +283,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -283,6 +283,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean isFrozen(); -+ // Paper start - move invisibility up to Entity ++ // Paper start - missing entity api + /** + * Sets whether the entity is invisible or not. + *

@@ -433,15 +434,29 @@ index d68ccecaadcf7a906058e66a750f4cfce5dd7b3f..efe812b4d47df6f8b5ba54ec4526f3dc + * + * @param invisible If the entity is invisible + */ -+ void setInvisible(boolean invisible); ++ void setInvisible(boolean invisible); // Paper - moved up from LivingEntity + + /** + * Gets whether the entity is invisible or not. + * + * @return Whether the entity is invisible + */ -+ boolean isInvisible(); -+ // Paper end - move invisibility up to Entity ++ boolean isInvisible(); // Paper - moved up from LivingEntity ++ ++ /** ++ * Sets this entities no physics status. ++ * ++ * @param noPhysics boolean indicating if the entity should not have physics. ++ */ ++ void setNoPhysics(boolean noPhysics); ++ ++ /** ++ * Gets if this entity has no physics. ++ * ++ * @return true if the entity does not have physics. ++ */ ++ boolean hasNoPhysics(); ++ // Paper end - missing entity api + /** * Mark the entity's removal. diff --git a/patches/api/0299-Adds-PlayerArmSwingEvent.patch b/patches/api/0298-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/api/0299-Adds-PlayerArmSwingEvent.patch rename to patches/api/0298-Adds-PlayerArmSwingEvent.patch diff --git a/patches/api/0300-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0299-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/api/0300-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/api/0299-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/api/0301-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0300-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/api/0301-fix-empty-array-elements-in-command-arguments.patch rename to patches/api/0300-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/api/0302-Stinger-API.patch b/patches/api/0301-Stinger-API.patch similarity index 95% rename from patches/api/0302-Stinger-API.patch rename to patches/api/0301-Stinger-API.patch index d2dc349f90..4966f6d228 100644 --- a/patches/api/0302-Stinger-API.patch +++ b/patches/api/0301-Stinger-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 6e6b80843a8669b422f93e98343e1da9f8546ee7..d083cffe0b61642bf4c4ea0fecc529090702042f 100644 +index ff89fc699b7aaba982c59ace4effaffc5285ca17..41ca8fea2aede178bdbe87c05588bce4f2faf8e6 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -419,6 +419,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0303-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0302-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/api/0303-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/api/0302-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/api/0304-Add-PlayerSetSpawnEvent.patch b/patches/api/0303-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/api/0304-Add-PlayerSetSpawnEvent.patch rename to patches/api/0303-Add-PlayerSetSpawnEvent.patch diff --git a/patches/api/0305-Added-EntityDamageItemEvent.patch b/patches/api/0304-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/api/0305-Added-EntityDamageItemEvent.patch rename to patches/api/0304-Added-EntityDamageItemEvent.patch diff --git a/patches/api/0306-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0305-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/api/0306-Make-EntityUnleashEvent-cancellable.patch rename to patches/api/0305-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/api/0307-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0306-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/api/0307-Change-EnderEye-target-without-changing-other-things.patch rename to patches/api/0306-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/api/0308-Add-BlockBreakBlockEvent.patch b/patches/api/0307-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/api/0308-Add-BlockBreakBlockEvent.patch rename to patches/api/0307-Add-BlockBreakBlockEvent.patch diff --git a/patches/api/0309-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0308-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/api/0309-Add-helpers-for-left-right-click-to-Action.patch rename to patches/api/0308-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/api/0310-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0309-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/api/0310-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/api/0309-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/api/0311-More-CommandBlock-API.patch b/patches/api/0310-More-CommandBlock-API.patch similarity index 100% rename from patches/api/0311-More-CommandBlock-API.patch rename to patches/api/0310-More-CommandBlock-API.patch diff --git a/patches/api/0312-Add-missing-team-sidebar-display-slots.patch b/patches/api/0311-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/api/0312-Add-missing-team-sidebar-display-slots.patch rename to patches/api/0311-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/api/0313-add-back-EntityPortalExitEvent.patch b/patches/api/0312-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/api/0313-add-back-EntityPortalExitEvent.patch rename to patches/api/0312-add-back-EntityPortalExitEvent.patch diff --git a/patches/api/0314-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0313-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/api/0314-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/api/0313-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/api/0315-Get-entity-default-attributes.patch b/patches/api/0314-Get-entity-default-attributes.patch similarity index 100% rename from patches/api/0315-Get-entity-default-attributes.patch rename to patches/api/0314-Get-entity-default-attributes.patch diff --git a/patches/api/0316-Left-handed-API.patch b/patches/api/0315-Left-handed-API.patch similarity index 100% rename from patches/api/0316-Left-handed-API.patch rename to patches/api/0315-Left-handed-API.patch diff --git a/patches/api/0317-Add-critical-damage-API.patch b/patches/api/0316-Add-critical-damage-API.patch similarity index 100% rename from patches/api/0317-Add-critical-damage-API.patch rename to patches/api/0316-Add-critical-damage-API.patch diff --git a/patches/api/0318-Add-more-advancement-API.patch b/patches/api/0317-Add-more-advancement-API.patch similarity index 100% rename from patches/api/0318-Add-more-advancement-API.patch rename to patches/api/0317-Add-more-advancement-API.patch diff --git a/patches/api/0319-Fix-issues-with-mob-conversion.patch b/patches/api/0318-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/api/0319-Fix-issues-with-mob-conversion.patch rename to patches/api/0318-Fix-issues-with-mob-conversion.patch diff --git a/patches/api/0320-Add-isCollidable-methods-to-various-places.patch b/patches/api/0319-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/api/0320-Add-isCollidable-methods-to-various-places.patch rename to patches/api/0319-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/api/0321-Goat-ram-API.patch b/patches/api/0320-Goat-ram-API.patch similarity index 100% rename from patches/api/0321-Goat-ram-API.patch rename to patches/api/0320-Goat-ram-API.patch diff --git a/patches/api/0322-Add-API-for-resetting-a-single-score.patch b/patches/api/0321-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/api/0322-Add-API-for-resetting-a-single-score.patch rename to patches/api/0321-Add-API-for-resetting-a-single-score.patch diff --git a/patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch similarity index 94% rename from patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch rename to patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch index f378113a44..0f3a5bae4e 100644 --- a/patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch @@ -24,10 +24,10 @@ index 434fde52986ba07d7209ff47483f74fe31e8ebe7..0c7204e390f44b649fc26cd46152abeb * Creates and returns the next EntityId available. *

diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index efe812b4d47df6f8b5ba54ec4526f3dcd20f180f..a09640dce6f61f808f516f5569e08e9e6a2f2b53 100644 +index 9272c15619f623dc39d9c9046fd6463674c37264..9cb84eababf159b04618a605ff03cdaee72c9502 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -911,5 +911,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -925,5 +925,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @Deprecated @NotNull Set getTrackedPlayers(); diff --git a/patches/api/0324-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0323-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/api/0324-Add-PlayerItemFrameChangeEvent.patch rename to patches/api/0323-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/api/0325-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/api/0325-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/api/0326-Add-more-Campfire-API.patch b/patches/api/0325-Add-more-Campfire-API.patch similarity index 100% rename from patches/api/0326-Add-more-Campfire-API.patch rename to patches/api/0325-Add-more-Campfire-API.patch diff --git a/patches/api/0327-Extend-VehicleCollisionEvent-move-HandlerList-up.patch b/patches/api/0326-Extend-VehicleCollisionEvent-move-HandlerList-up.patch similarity index 100% rename from patches/api/0327-Extend-VehicleCollisionEvent-move-HandlerList-up.patch rename to patches/api/0326-Extend-VehicleCollisionEvent-move-HandlerList-up.patch diff --git a/patches/api/0328-Improve-scoreboard-entries.patch b/patches/api/0327-Improve-scoreboard-entries.patch similarity index 100% rename from patches/api/0328-Improve-scoreboard-entries.patch rename to patches/api/0327-Improve-scoreboard-entries.patch diff --git a/patches/api/0329-Entity-powdered-snow-API.patch b/patches/api/0328-Entity-powdered-snow-API.patch similarity index 90% rename from patches/api/0329-Entity-powdered-snow-API.patch rename to patches/api/0328-Entity-powdered-snow-API.patch index b5b1dbedbd..2b48461850 100644 --- a/patches/api/0329-Entity-powdered-snow-API.patch +++ b/patches/api/0328-Entity-powdered-snow-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity powdered snow API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index a09640dce6f61f808f516f5569e08e9e6a2f2b53..336cd1830182d4aac0fc7b5be629da4fc78c5cf8 100644 +index 9cb84eababf159b04618a605ff03cdaee72c9502..a7b37ba26d8999a78a747fe5a41e15327ae3a2ee 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -938,5 +938,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -952,5 +952,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return Whether the entity was successfully spawned. */ public boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason); diff --git a/patches/api/0330-Add-API-for-item-entity-health.patch b/patches/api/0329-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/api/0330-Add-API-for-item-entity-health.patch rename to patches/api/0329-Add-API-for-item-entity-health.patch diff --git a/patches/api/0331-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0330-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/api/0331-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/api/0330-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/api/0332-Bucketable-API.patch b/patches/api/0331-Bucketable-API.patch similarity index 100% rename from patches/api/0332-Bucketable-API.patch rename to patches/api/0331-Bucketable-API.patch diff --git a/patches/api/0333-System-prop-for-default-config-comment-parsing.patch b/patches/api/0332-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/api/0333-System-prop-for-default-config-comment-parsing.patch rename to patches/api/0332-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/api/0334-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0333-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/api/0334-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/api/0333-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/api/0335-Multiple-Entries-with-Scoreboards.patch b/patches/api/0334-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/api/0335-Multiple-Entries-with-Scoreboards.patch rename to patches/api/0334-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/api/0336-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0335-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/api/0336-Warn-on-strange-EventHandler-return-types.patch rename to patches/api/0335-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/api/0337-Multi-Block-Change-API.patch b/patches/api/0336-Multi-Block-Change-API.patch similarity index 95% rename from patches/api/0337-Multi-Block-Change-API.patch rename to patches/api/0336-Multi-Block-Change-API.patch index 45664f22b3..8aa5be5a5c 100644 --- a/patches/api/0337-Multi-Block-Change-API.patch +++ b/patches/api/0336-Multi-Block-Change-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Multi Block Change API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 793df7533096efb0f60bddcb3e4e1575cbcc1069..c8a50647d34c70bc927c33c602f938a01bf6e7a9 100644 +index 4906bec154d0f60420fbe2cffa8c7df0918ca61b..2501533048e4de25672d9cc0a52fa1150e6d8adb 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -895,6 +895,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0338-Fix-NotePlayEvent.patch b/patches/api/0337-Fix-NotePlayEvent.patch similarity index 100% rename from patches/api/0338-Fix-NotePlayEvent.patch rename to patches/api/0337-Fix-NotePlayEvent.patch diff --git a/patches/api/0339-Freeze-Tick-Lock-API.patch b/patches/api/0338-Freeze-Tick-Lock-API.patch similarity index 81% rename from patches/api/0339-Freeze-Tick-Lock-API.patch rename to patches/api/0338-Freeze-Tick-Lock-API.patch index ae7c328cc6..f7ef909291 100644 --- a/patches/api/0339-Freeze-Tick-Lock-API.patch +++ b/patches/api/0338-Freeze-Tick-Lock-API.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 336cd1830182d4aac0fc7b5be629da4fc78c5cf8..5be7daff9077f35aa1d3abf747f7d147a1532b55 100644 +index a7b37ba26d8999a78a747fe5a41e15327ae3a2ee..9b5fe55399594c57c1b1521bea03781fd99fdf60 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -303,6 +303,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent - boolean isInvisible(); - // Paper end - move invisibility up to Entity +@@ -317,6 +317,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent + boolean hasNoPhysics(); + // Paper end - missing entity api + // Paper start - Freeze Tick Lock API + /** diff --git a/patches/api/0340-Dolphin-API.patch b/patches/api/0339-Dolphin-API.patch similarity index 100% rename from patches/api/0340-Dolphin-API.patch rename to patches/api/0339-Dolphin-API.patch diff --git a/patches/api/0341-More-PotionEffectType-API.patch b/patches/api/0340-More-PotionEffectType-API.patch similarity index 100% rename from patches/api/0341-More-PotionEffectType-API.patch rename to patches/api/0340-More-PotionEffectType-API.patch diff --git a/patches/api/0342-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/api/0342-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/api/0343-Implement-regenerateChunk.patch b/patches/api/0342-Implement-regenerateChunk.patch similarity index 100% rename from patches/api/0343-Implement-regenerateChunk.patch rename to patches/api/0342-Implement-regenerateChunk.patch diff --git a/patches/api/0344-Add-GameEvent-tags.patch b/patches/api/0343-Add-GameEvent-tags.patch similarity index 100% rename from patches/api/0344-Add-GameEvent-tags.patch rename to patches/api/0343-Add-GameEvent-tags.patch diff --git a/patches/api/0345-Furnace-RecipesUsed-API.patch b/patches/api/0344-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/api/0345-Furnace-RecipesUsed-API.patch rename to patches/api/0344-Furnace-RecipesUsed-API.patch diff --git a/patches/api/0346-Configurable-sculk-sensor-listener-range.patch b/patches/api/0345-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/api/0346-Configurable-sculk-sensor-listener-range.patch rename to patches/api/0345-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/api/0347-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0346-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/api/0347-Add-missing-block-data-mins-and-maxes.patch rename to patches/api/0346-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/api/0348-Custom-Potion-Mixes.patch b/patches/api/0347-Custom-Potion-Mixes.patch similarity index 100% rename from patches/api/0348-Custom-Potion-Mixes.patch rename to patches/api/0347-Custom-Potion-Mixes.patch diff --git a/patches/api/0349-Expose-furnace-minecart-push-values.patch b/patches/api/0348-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/api/0349-Expose-furnace-minecart-push-values.patch rename to patches/api/0348-Expose-furnace-minecart-push-values.patch diff --git a/patches/api/0350-More-Projectile-API.patch b/patches/api/0349-More-Projectile-API.patch similarity index 97% rename from patches/api/0350-More-Projectile-API.patch rename to patches/api/0349-More-Projectile-API.patch index 569c337346..dcad065186 100644 --- a/patches/api/0350-More-Projectile-API.patch +++ b/patches/api/0349-More-Projectile-API.patch @@ -6,13 +6,22 @@ Subject: [PATCH] More Projectile API Co-authored-by: Nassim Jahnke diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java -index 225a24898acd25038ea2a8448f9f3b57643d3026..d173010d51d05928c35bb4bf5fbc08ce221ec474 100644 +index e8e56e89e32d84af0639fe2e9b0eeabd747b6007..2d7521b71ec16e1b229bbe4c05d51673720df475 100644 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java -@@ -151,6 +151,36 @@ public interface AbstractArrow extends Projectile { - @NotNull - org.bukkit.inventory.ItemStack getItemStack(); - +@@ -174,5 +174,43 @@ public interface AbstractArrow extends Projectile { + ALLOWED, + CREATIVE_ONLY; + } ++ ++ /** ++ * Gets the ItemStack for this arrow. ++ * ++ * @return The ItemStack, as if a player picked up the arrow ++ */ ++ @NotNull ++ org.bukkit.inventory.ItemStack getItemStack(); ++ + /** + * Sets the amount of ticks this arrow has been alive in the world + * This is used to determine when the arrow should be automatically despawned. @@ -42,10 +51,8 @@ index 225a24898acd25038ea2a8448f9f3b57643d3026..d173010d51d05928c35bb4bf5fbc08ce + * @param sound sound that is played + */ + void setHitSound(@NotNull org.bukkit.Sound sound); -+ - /** - * Sets this arrow to "noclip" status. - * + // Paper end + } diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java index 0d31aa0b22cf1e849572294e2cfe38b48c9210af..217d348ad0bbef720b25d3b507a55ca8105b7731 100644 --- a/src/main/java/org/bukkit/entity/Firework.java diff --git a/patches/api/0351-Add-getComputedBiome-API.patch b/patches/api/0350-Add-getComputedBiome-API.patch similarity index 100% rename from patches/api/0351-Add-getComputedBiome-API.patch rename to patches/api/0350-Add-getComputedBiome-API.patch diff --git a/patches/api/0352-Add-enchantWithLevels-API.patch b/patches/api/0351-Add-enchantWithLevels-API.patch similarity index 100% rename from patches/api/0352-Add-enchantWithLevels-API.patch rename to patches/api/0351-Add-enchantWithLevels-API.patch diff --git a/patches/api/0353-Add-TameableDeathMessageEvent.patch b/patches/api/0352-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/api/0353-Add-TameableDeathMessageEvent.patch rename to patches/api/0352-Add-TameableDeathMessageEvent.patch diff --git a/patches/api/0354-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0353-Allow-to-change-the-podium-of-the-EnderDragon.patch similarity index 100% rename from patches/api/0354-Allow-to-change-the-podium-of-the-EnderDragon.patch rename to patches/api/0353-Allow-to-change-the-podium-of-the-EnderDragon.patch diff --git a/patches/api/0355-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0354-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch similarity index 100% rename from patches/api/0355-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch rename to patches/api/0354-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch diff --git a/patches/api/0356-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0355-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/api/0356-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/api/0355-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/api/0357-WorldCreator-keepSpawnLoaded.patch b/patches/api/0356-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/api/0357-WorldCreator-keepSpawnLoaded.patch rename to patches/api/0356-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/api/0358-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0357-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/api/0358-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/api/0357-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/api/0359-Add-PlayerStopUsingItemEvent.patch b/patches/api/0358-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/api/0359-Add-PlayerStopUsingItemEvent.patch rename to patches/api/0358-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/api/0360-Expand-FallingBlock-API.patch b/patches/api/0359-Expand-FallingBlock-API.patch similarity index 100% rename from patches/api/0360-Expand-FallingBlock-API.patch rename to patches/api/0359-Expand-FallingBlock-API.patch diff --git a/patches/api/0361-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0360-Add-method-isTickingWorlds-to-Bukkit.patch similarity index 100% rename from patches/api/0361-Add-method-isTickingWorlds-to-Bukkit.patch rename to patches/api/0360-Add-method-isTickingWorlds-to-Bukkit.patch diff --git a/patches/api/0362-Add-WardenAngerChangeEvent.patch b/patches/api/0361-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/api/0362-Add-WardenAngerChangeEvent.patch rename to patches/api/0361-Add-WardenAngerChangeEvent.patch diff --git a/patches/api/0363-Nameable-Banner-API.patch b/patches/api/0362-Nameable-Banner-API.patch similarity index 100% rename from patches/api/0363-Nameable-Banner-API.patch rename to patches/api/0362-Nameable-Banner-API.patch diff --git a/patches/api/0364-Add-Player-getFishHook.patch b/patches/api/0363-Add-Player-getFishHook.patch similarity index 100% rename from patches/api/0364-Add-Player-getFishHook.patch rename to patches/api/0363-Add-Player-getFishHook.patch diff --git a/patches/api/0365-More-Teleport-API.patch b/patches/api/0364-More-Teleport-API.patch similarity index 99% rename from patches/api/0365-More-Teleport-API.patch rename to patches/api/0364-More-Teleport-API.patch index e3595a1947..f158c47e4e 100644 --- a/patches/api/0365-More-Teleport-API.patch +++ b/patches/api/0364-More-Teleport-API.patch @@ -120,7 +120,7 @@ index 0000000000000000000000000000000000000000..c8b5b570d44da9524bfc59c7e11b2ae5 + +} diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index e1fe5d93eb7a1f96954d907dbbe0758f25bd1ce7..948d6a08ff459afd5d4d5b151c41d94d1d5847b6 100644 +index 9b5fe55399594c57c1b1521bea03781fd99fdf60..e2f315db8d137d7bc1b6fc83ed29032152f881f2 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -126,10 +126,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0366-Add-EntityPortalReadyEvent.patch b/patches/api/0365-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/api/0366-Add-EntityPortalReadyEvent.patch rename to patches/api/0365-Add-EntityPortalReadyEvent.patch diff --git a/patches/api/0367-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0366-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/api/0367-Custom-Chat-Completion-Suggestions-API.patch rename to patches/api/0366-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/api/0368-Collision-API.patch b/patches/api/0367-Collision-API.patch similarity index 92% rename from patches/api/0368-Collision-API.patch rename to patches/api/0367-Collision-API.patch index 61881abf50..b7bf3a1ae3 100644 --- a/patches/api/0368-Collision-API.patch +++ b/patches/api/0367-Collision-API.patch @@ -25,10 +25,10 @@ index 44ee56a5956cc17194c767a0c1071a2abffe818a..43dd6c59cceba12f27e6b265acc3ad97 // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 82c9e07a059bc481d877c7fbb2fbf866bf607017..7ab1ffa2fa7a99ddf32f60ce4b48680eae698da9 100644 +index e2f315db8d137d7bc1b6fc83ed29032152f881f2..4951afd12de6145f671bae40a4df6e2222bc3fd8 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -988,4 +988,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1002,4 +1002,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean isInPowderedSnow(); // Paper end diff --git a/patches/api/0369-Block-Ticking-API.patch b/patches/api/0368-Block-Ticking-API.patch similarity index 100% rename from patches/api/0369-Block-Ticking-API.patch rename to patches/api/0368-Block-Ticking-API.patch diff --git a/patches/api/0370-Add-NamespacedKey-biome-methods.patch b/patches/api/0369-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/api/0370-Add-NamespacedKey-biome-methods.patch rename to patches/api/0369-Add-NamespacedKey-biome-methods.patch diff --git a/patches/api/0371-Also-load-resources-from-LibraryLoader.patch b/patches/api/0370-Also-load-resources-from-LibraryLoader.patch similarity index 100% rename from patches/api/0371-Also-load-resources-from-LibraryLoader.patch rename to patches/api/0370-Also-load-resources-from-LibraryLoader.patch diff --git a/patches/api/0372-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0371-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/api/0372-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/api/0371-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/api/0373-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0372-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/api/0373-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/api/0372-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/api/0374-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0373-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch similarity index 100% rename from patches/api/0374-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch rename to patches/api/0373-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch diff --git a/patches/api/0375-Add-getDrops-to-BlockState.patch b/patches/api/0374-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/api/0375-Add-getDrops-to-BlockState.patch rename to patches/api/0374-Add-getDrops-to-BlockState.patch diff --git a/patches/api/0376-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0375-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/api/0376-Add-PlayerInventorySlotChangeEvent.patch rename to patches/api/0375-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/api/0377-Elder-Guardian-appearance-API.patch b/patches/api/0376-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/api/0377-Elder-Guardian-appearance-API.patch rename to patches/api/0376-Elder-Guardian-appearance-API.patch diff --git a/patches/api/0378-Allow-changing-bed-s-occupied-property.patch b/patches/api/0377-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/api/0378-Allow-changing-bed-s-occupied-property.patch rename to patches/api/0377-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/api/0379-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0378-Add-EquipmentSlot-convenience-methods.patch similarity index 100% rename from patches/api/0379-Add-EquipmentSlot-convenience-methods.patch rename to patches/api/0378-Add-EquipmentSlot-convenience-methods.patch diff --git a/patches/api/0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0379-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch similarity index 100% rename from patches/api/0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch rename to patches/api/0379-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch diff --git a/patches/api/0381-Add-entity-knockback-API.patch b/patches/api/0380-Add-entity-knockback-API.patch similarity index 100% rename from patches/api/0381-Add-entity-knockback-API.patch rename to patches/api/0380-Add-entity-knockback-API.patch diff --git a/patches/api/0382-Added-EntityToggleSitEvent.patch b/patches/api/0381-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/api/0382-Added-EntityToggleSitEvent.patch rename to patches/api/0381-Added-EntityToggleSitEvent.patch diff --git a/patches/api/0383-Add-Moving-Piston-API.patch b/patches/api/0382-Add-Moving-Piston-API.patch similarity index 100% rename from patches/api/0383-Add-Moving-Piston-API.patch rename to patches/api/0382-Add-Moving-Piston-API.patch diff --git a/patches/api/0384-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0383-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/api/0384-Add-PrePlayerAttackEntityEvent.patch rename to patches/api/0383-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/api/0385-Add-Player-Warden-Warning-API.patch b/patches/api/0384-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/api/0385-Add-Player-Warden-Warning-API.patch rename to patches/api/0384-Add-Player-Warden-Warning-API.patch diff --git a/patches/api/0386-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0385-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/api/0386-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/api/0385-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/api/0387-Add-paper-dumplisteners-command.patch b/patches/api/0386-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/api/0387-Add-paper-dumplisteners-command.patch rename to patches/api/0386-Add-paper-dumplisteners-command.patch diff --git a/patches/api/0388-ItemStack-damage-API.patch b/patches/api/0387-ItemStack-damage-API.patch similarity index 100% rename from patches/api/0388-ItemStack-damage-API.patch rename to patches/api/0387-ItemStack-damage-API.patch diff --git a/patches/api/0389-Add-Tick-TemporalUnit.patch b/patches/api/0388-Add-Tick-TemporalUnit.patch similarity index 100% rename from patches/api/0389-Add-Tick-TemporalUnit.patch rename to patches/api/0388-Add-Tick-TemporalUnit.patch diff --git a/patches/api/0390-Friction-API.patch b/patches/api/0389-Friction-API.patch similarity index 96% rename from patches/api/0390-Friction-API.patch rename to patches/api/0389-Friction-API.patch index 013ab9a8d3..23fa01d063 100644 --- a/patches/api/0390-Friction-API.patch +++ b/patches/api/0389-Friction-API.patch @@ -59,7 +59,7 @@ index ced419f8655bff72f0257b639d5f7d73afe3c2e2..bcc6ba95bd21c7972865838c636a03f5 /** * Gets the item stack associated with this item drop. diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index cb5ba5d115406d12a2af0811fcfbf510f836b03b..b9f98279789fe26181aa9c7aa253877d916034be 100644 +index 041ff387a0f9e8037e2834118ef241ddb8970907..3a26b3c40f877a454c3c76b68b86776f05950002 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0391-Player-Entity-Tracking-Events.patch b/patches/api/0390-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/api/0391-Player-Entity-Tracking-Events.patch rename to patches/api/0390-Player-Entity-Tracking-Events.patch diff --git a/patches/api/0392-Add-missing-Fluid-type.patch b/patches/api/0391-Add-missing-Fluid-type.patch similarity index 100% rename from patches/api/0392-Add-missing-Fluid-type.patch rename to patches/api/0391-Add-missing-Fluid-type.patch diff --git a/patches/api/0393-fix-Instruments.patch b/patches/api/0392-fix-Instruments.patch similarity index 100% rename from patches/api/0393-fix-Instruments.patch rename to patches/api/0392-fix-Instruments.patch diff --git a/patches/api/0394-Add-BlockLockCheckEvent.patch b/patches/api/0393-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/api/0394-Add-BlockLockCheckEvent.patch rename to patches/api/0393-Add-BlockLockCheckEvent.patch diff --git a/patches/api/0395-Add-Sneaking-API-for-Entities.patch b/patches/api/0394-Add-Sneaking-API-for-Entities.patch similarity index 91% rename from patches/api/0395-Add-Sneaking-API-for-Entities.patch rename to patches/api/0394-Add-Sneaking-API-for-Entities.patch index 70178866ab..be37d7f75d 100644 --- a/patches/api/0395-Add-Sneaking-API-for-Entities.patch +++ b/patches/api/0394-Add-Sneaking-API-for-Entities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Sneaking API for Entities diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 7ab1ffa2fa7a99ddf32f60ce4b48680eae698da9..e0e93cb945202890387c1dc3c32927525e40296c 100644 +index 4951afd12de6145f671bae40a4df6e2222bc3fd8..909926485a66e09988f7787b1d5ee2cf9c012558 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -799,6 +799,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -813,6 +813,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @NotNull Pose getPose(); diff --git a/patches/api/0396-Improve-PortalEvents.patch b/patches/api/0395-Improve-PortalEvents.patch similarity index 100% rename from patches/api/0396-Improve-PortalEvents.patch rename to patches/api/0395-Improve-PortalEvents.patch diff --git a/patches/api/0397-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/api/0396-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/api/0397-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/api/0396-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/api/0398-Flying-Fall-Damage-API.patch b/patches/api/0397-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/api/0398-Flying-Fall-Damage-API.patch rename to patches/api/0397-Flying-Fall-Damage-API.patch diff --git a/patches/api/0399-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0398-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch similarity index 100% rename from patches/api/0399-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch rename to patches/api/0398-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch diff --git a/patches/api/0400-Win-Screen-API.patch b/patches/api/0399-Win-Screen-API.patch similarity index 96% rename from patches/api/0400-Win-Screen-API.patch rename to patches/api/0399-Win-Screen-API.patch index 3863beaa63..3741437041 100644 --- a/patches/api/0400-Win-Screen-API.patch +++ b/patches/api/0399-Win-Screen-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Win Screen API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9d81aec1346d07faa47745a3cb79bac4a8a4ffa3..b49294027712e8d0b8aaaee1c041bc731b4cb184 100644 +index 6fc27c35f8533b37d82f0db5605d4d06e70af18b..0966eb33f0a1cf74a2f2fc3cbb74c756848e2eeb 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1205,6 +1205,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0401-Add-Entity-Body-Yaw-API.patch b/patches/api/0400-Add-Entity-Body-Yaw-API.patch similarity index 93% rename from patches/api/0401-Add-Entity-Body-Yaw-API.patch rename to patches/api/0400-Add-Entity-Body-Yaw-API.patch index 8d0776b93e..55b49feb0c 100644 --- a/patches/api/0401-Add-Entity-Body-Yaw-API.patch +++ b/patches/api/0400-Add-Entity-Body-Yaw-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index e0e93cb945202890387c1dc3c32927525e40296c..18a2f82ecf9ca3ecb80053666d0de192e5185531 100644 +index 909926485a66e09988f7787b1d5ee2cf9c012558..17d5a5458ee51d8db243326745875ef31ba95fb3 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1006,6 +1006,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1020,6 +1020,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return true if in powdered snow. */ boolean isInPowderedSnow(); diff --git a/patches/api/0402-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0401-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch similarity index 100% rename from patches/api/0402-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch rename to patches/api/0401-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch diff --git a/patches/api/0403-Add-EntityFertilizeEggEvent.patch b/patches/api/0402-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/api/0403-Add-EntityFertilizeEggEvent.patch rename to patches/api/0402-Add-EntityFertilizeEggEvent.patch diff --git a/patches/api/0404-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0403-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/api/0404-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/api/0403-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/api/0405-Add-Shearable-API.patch b/patches/api/0404-Add-Shearable-API.patch similarity index 97% rename from patches/api/0405-Add-Shearable-API.patch rename to patches/api/0404-Add-Shearable-API.patch index 4e49b17572..19ef9a4a36 100644 --- a/patches/api/0405-Add-Shearable-API.patch +++ b/patches/api/0404-Add-Shearable-API.patch @@ -54,7 +54,7 @@ index 0000000000000000000000000000000000000000..0d5793790ab6a47525ad330335173612 + boolean readyToBeSheared(); +} diff --git a/src/main/java/org/bukkit/entity/MushroomCow.java b/src/main/java/org/bukkit/entity/MushroomCow.java -index 794b7b4a870a0d289476074e3a3f46552604c954..2f9aefd38c43755c79b30abddd6643b26880bd0d 100644 +index cef1700834643fe28ed5737578d91ecefbe99e2f..86c0043ef4e1288b6fe2f68a9b6d01c3de2c3454 100644 --- a/src/main/java/org/bukkit/entity/MushroomCow.java +++ b/src/main/java/org/bukkit/entity/MushroomCow.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/api/0406-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0405-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/api/0406-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/api/0405-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/api/0407-Add-Mob-Experience-reward-API.patch b/patches/api/0406-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/api/0407-Add-Mob-Experience-reward-API.patch rename to patches/api/0406-Add-Mob-Experience-reward-API.patch diff --git a/patches/api/0408-Expand-PlayerItemMendEvent.patch b/patches/api/0407-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/api/0408-Expand-PlayerItemMendEvent.patch rename to patches/api/0407-Expand-PlayerItemMendEvent.patch diff --git a/patches/api/0409-Add-transient-modifier-API.patch b/patches/api/0408-Add-transient-modifier-API.patch similarity index 100% rename from patches/api/0409-Add-transient-modifier-API.patch rename to patches/api/0408-Add-transient-modifier-API.patch diff --git a/patches/api/0410-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0409-Properly-remove-the-experimental-smithing-inventory-.patch similarity index 100% rename from patches/api/0410-Properly-remove-the-experimental-smithing-inventory-.patch rename to patches/api/0409-Properly-remove-the-experimental-smithing-inventory-.patch diff --git a/patches/api/0411-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0410-Add-method-to-remove-all-active-potion-effects.patch similarity index 91% rename from patches/api/0411-Add-method-to-remove-all-active-potion-effects.patch rename to patches/api/0410-Add-method-to-remove-all-active-potion-effects.patch index f9f5110086..33a8a647a9 100644 --- a/patches/api/0411-Add-method-to-remove-all-active-potion-effects.patch +++ b/patches/api/0410-Add-method-to-remove-all-active-potion-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 2dbb61df25967739c5a8308d6d89be20136816ba..12926d36a409448ce5aaae955968dbc89825a2c5 100644 +index b7b87b2962eabcf2e8864335e4da22c0b9da8e5c..65dab533a33433bdd79601df4f109d9de6998fb8 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -625,6 +625,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0412-Folia-scheduler-and-owned-region-API.patch b/patches/api/0411-Folia-scheduler-and-owned-region-API.patch similarity index 99% rename from patches/api/0412-Folia-scheduler-and-owned-region-API.patch rename to patches/api/0411-Folia-scheduler-and-owned-region-API.patch index 71062196c9..b94a139667 100644 --- a/patches/api/0412-Folia-scheduler-and-owned-region-API.patch +++ b/patches/api/0411-Folia-scheduler-and-owned-region-API.patch @@ -769,10 +769,10 @@ index d433a9d2fe0bb487865fec33307cc4c45af475a0..f819de247080d58803a2851a4cab28d2 + // Paper end - Folia region threading API } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 18a2f82ecf9ca3ecb80053666d0de192e5185531..a5602bf27965a8aac97aa5279a23e785729a4921 100644 +index 17d5a5458ee51d8db243326745875ef31ba95fb3..05076e0648407d026b3adba43756e57f7e925abe 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1066,4 +1066,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1080,4 +1080,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean wouldCollideUsing(@NotNull BoundingBox boundingBox); // Paper end - Collision API diff --git a/patches/api/0413-Add-event-for-player-editing-sign.patch b/patches/api/0412-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/api/0413-Add-event-for-player-editing-sign.patch rename to patches/api/0412-Add-event-for-player-editing-sign.patch diff --git a/patches/api/0414-Add-Sign-getInteractableSideFor.patch b/patches/api/0413-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/api/0414-Add-Sign-getInteractableSideFor.patch rename to patches/api/0413-Add-Sign-getInteractableSideFor.patch diff --git a/patches/api/0415-Fix-BanList-API.patch b/patches/api/0414-Fix-BanList-API.patch similarity index 100% rename from patches/api/0415-Fix-BanList-API.patch rename to patches/api/0414-Fix-BanList-API.patch diff --git a/patches/api/0416-Add-whitelist-events.patch b/patches/api/0415-Add-whitelist-events.patch similarity index 100% rename from patches/api/0416-Add-whitelist-events.patch rename to patches/api/0415-Add-whitelist-events.patch diff --git a/patches/api/0417-API-for-updating-recipes-on-clients.patch b/patches/api/0416-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/api/0417-API-for-updating-recipes-on-clients.patch rename to patches/api/0416-API-for-updating-recipes-on-clients.patch diff --git a/patches/api/0418-Add-PlayerFailMoveEvent.patch b/patches/api/0417-Add-PlayerFailMoveEvent.patch similarity index 100% rename from patches/api/0418-Add-PlayerFailMoveEvent.patch rename to patches/api/0417-Add-PlayerFailMoveEvent.patch diff --git a/patches/api/0419-Fix-custom-statistic-criteria-creation.patch b/patches/api/0418-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/api/0419-Fix-custom-statistic-criteria-creation.patch rename to patches/api/0418-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/api/0420-SculkCatalyst-bloom-API.patch b/patches/api/0419-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/api/0420-SculkCatalyst-bloom-API.patch rename to patches/api/0419-SculkCatalyst-bloom-API.patch diff --git a/patches/api/0421-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0420-API-for-an-entity-s-scoreboard-name.patch similarity index 88% rename from patches/api/0421-API-for-an-entity-s-scoreboard-name.patch rename to patches/api/0420-API-for-an-entity-s-scoreboard-name.patch index 85895ba202..67e76951f0 100644 --- a/patches/api/0421-API-for-an-entity-s-scoreboard-name.patch +++ b/patches/api/0420-API-for-an-entity-s-scoreboard-name.patch @@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different methods depending on the implementation of Entity you were working with. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index a5602bf27965a8aac97aa5279a23e785729a4921..cbea8b9088fff5f08a47f6b26d7554d00710eb9f 100644 +index 05076e0648407d026b3adba43756e57f7e925abe..a7045fdf70e7dac94034ed6727a4eb29f31a9cdf 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1077,4 +1077,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1091,4 +1091,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull io.papermc.paper.threadedregions.scheduler.EntityScheduler getScheduler(); // Paper end - Folia schedulers diff --git a/patches/api/0422-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0421-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/api/0422-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/api/0421-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/api/0423-Add-Listing-API-for-Player.patch b/patches/api/0422-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/api/0423-Add-Listing-API-for-Player.patch rename to patches/api/0422-Add-Listing-API-for-Player.patch diff --git a/patches/api/0424-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0423-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/api/0424-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/api/0423-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/api/0425-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0424-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/api/0425-Fix-NPE-on-Boat-getStatus.patch rename to patches/api/0424-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/api/0426-Expand-Pose-API.patch b/patches/api/0425-Expand-Pose-API.patch similarity index 92% rename from patches/api/0426-Expand-Pose-API.patch rename to patches/api/0425-Expand-Pose-API.patch index b016f55d9b..0c88faca26 100644 --- a/patches/api/0426-Expand-Pose-API.patch +++ b/patches/api/0425-Expand-Pose-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expand Pose API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index cbea8b9088fff5f08a47f6b26d7554d00710eb9f..252ae4b7a002b34533988e0a574a24af8573a125 100644 +index a7045fdf70e7dac94034ed6727a4eb29f31a9cdf..66f9e50d96710a41ac009271a499318fcf119c54 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -816,6 +816,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -830,6 +830,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @param sneak true if the entity should be sneaking */ void setSneaking(boolean sneak); diff --git a/patches/api/0427-MerchantRecipe-add-copy-constructor.patch b/patches/api/0426-MerchantRecipe-add-copy-constructor.patch similarity index 100% rename from patches/api/0427-MerchantRecipe-add-copy-constructor.patch rename to patches/api/0426-MerchantRecipe-add-copy-constructor.patch diff --git a/patches/api/0428-More-DragonBattle-API.patch b/patches/api/0427-More-DragonBattle-API.patch similarity index 100% rename from patches/api/0428-More-DragonBattle-API.patch rename to patches/api/0427-More-DragonBattle-API.patch diff --git a/patches/api/0429-Add-PlayerPickItemEvent.patch b/patches/api/0428-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/api/0429-Add-PlayerPickItemEvent.patch rename to patches/api/0428-Add-PlayerPickItemEvent.patch diff --git a/patches/api/0430-Allow-trident-custom-damage.patch b/patches/api/0429-Allow-trident-custom-damage.patch similarity index 100% rename from patches/api/0430-Allow-trident-custom-damage.patch rename to patches/api/0429-Allow-trident-custom-damage.patch diff --git a/patches/api/0431-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0430-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/api/0431-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/api/0430-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/api/0432-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0431-Limit-setBurnTime-to-valid-short-values.patch similarity index 100% rename from patches/api/0432-Limit-setBurnTime-to-valid-short-values.patch rename to patches/api/0431-Limit-setBurnTime-to-valid-short-values.patch diff --git a/patches/api/0433-Add-OfflinePlayer-isConnected.patch b/patches/api/0432-Add-OfflinePlayer-isConnected.patch similarity index 95% rename from patches/api/0433-Add-OfflinePlayer-isConnected.patch rename to patches/api/0432-Add-OfflinePlayer-isConnected.patch index f1e75ce3e4..fad59b6a54 100644 --- a/patches/api/0433-Add-OfflinePlayer-isConnected.patch +++ b/patches/api/0432-Add-OfflinePlayer-isConnected.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add OfflinePlayer#isConnected This adds an alternative to OfflinePlayer#isOnline that returns true only if the same instance of the player is still online. This is generally more useful than isOnline as it allows you to determine if you have an instance of a Player that still exists. If a player relogs an old Player instance becomes unlinked leading to e.g. messages sent to the old player no longer arriving despite isOnline returning true. Checking against isConnected is more useful there to discard invalid instances. diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index ef6cb124adc98cb5231dc44e243450a2340f74af..abb5109ed08a3a651c2c27d4d17a3d49eb06da1e 100644 +index 6a84c3d0d15251694bb7a05393b9ff7a4d8e0617..30298a629b39bd43ce14b414fc697b2dfcbea89c 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -24,10 +24,26 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio diff --git a/patches/api/0434-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0433-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/api/0434-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/api/0433-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/api/0435-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0434-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/api/0435-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/api/0434-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/api/0436-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0435-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch similarity index 100% rename from patches/api/0436-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch rename to patches/api/0435-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch diff --git a/patches/api/0437-Add-player-idle-duration-API.patch b/patches/api/0436-Add-player-idle-duration-API.patch similarity index 100% rename from patches/api/0437-Add-player-idle-duration-API.patch rename to patches/api/0436-Add-player-idle-duration-API.patch diff --git a/patches/api/0438-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0437-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/api/0438-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/api/0437-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/api/0439-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0438-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/api/0439-Add-predicate-for-blocks-when-raytracing.patch rename to patches/api/0438-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/api/0440-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0439-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/api/0440-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/api/0439-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/api/0441-Add-UUID-attribute-modifier-API.patch b/patches/api/0440-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/api/0441-Add-UUID-attribute-modifier-API.patch rename to patches/api/0440-Add-UUID-attribute-modifier-API.patch diff --git a/patches/api/0442-Expand-LingeringPotion-API.patch b/patches/api/0441-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/api/0442-Expand-LingeringPotion-API.patch rename to patches/api/0441-Expand-LingeringPotion-API.patch diff --git a/patches/api/0443-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0442-Remove-unnecessary-durability-check-in-ItemStack-isS.patch similarity index 100% rename from patches/api/0443-Remove-unnecessary-durability-check-in-ItemStack-isS.patch rename to patches/api/0442-Remove-unnecessary-durability-check-in-ItemStack-isS.patch diff --git a/patches/api/0444-Add-Structure-check-API.patch b/patches/api/0443-Add-Structure-check-API.patch similarity index 100% rename from patches/api/0444-Add-Structure-check-API.patch rename to patches/api/0443-Add-Structure-check-API.patch diff --git a/patches/api/0445-add-missing-Experimental-annotations.patch b/patches/api/0444-add-missing-Experimental-annotations.patch similarity index 100% rename from patches/api/0445-add-missing-Experimental-annotations.patch rename to patches/api/0444-add-missing-Experimental-annotations.patch diff --git a/patches/api/0446-Add-more-scoreboard-API.patch b/patches/api/0445-Add-more-scoreboard-API.patch similarity index 100% rename from patches/api/0446-Add-more-scoreboard-API.patch rename to patches/api/0445-Add-more-scoreboard-API.patch diff --git a/patches/api/0447-Improve-Registry.patch b/patches/api/0446-Improve-Registry.patch similarity index 100% rename from patches/api/0447-Improve-Registry.patch rename to patches/api/0446-Improve-Registry.patch diff --git a/patches/api/0448-Add-experience-points-API.patch b/patches/api/0447-Add-experience-points-API.patch similarity index 100% rename from patches/api/0448-Add-experience-points-API.patch rename to patches/api/0447-Add-experience-points-API.patch diff --git a/patches/api/0449-Add-missing-InventoryType.patch b/patches/api/0448-Add-missing-InventoryType.patch similarity index 100% rename from patches/api/0449-Add-missing-InventoryType.patch rename to patches/api/0448-Add-missing-InventoryType.patch diff --git a/patches/api/0450-Add-drops-to-shear-events.patch b/patches/api/0449-Add-drops-to-shear-events.patch similarity index 100% rename from patches/api/0450-Add-drops-to-shear-events.patch rename to patches/api/0449-Add-drops-to-shear-events.patch diff --git a/patches/api/0451-Add-HiddenPotionEffect-API.patch b/patches/api/0450-Add-HiddenPotionEffect-API.patch similarity index 98% rename from patches/api/0451-Add-HiddenPotionEffect-API.patch rename to patches/api/0450-Add-HiddenPotionEffect-API.patch index 39585cefba..2c44d32af5 100644 --- a/patches/api/0451-Add-HiddenPotionEffect-API.patch +++ b/patches/api/0450-Add-HiddenPotionEffect-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add HiddenPotionEffect API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 12926d36a409448ce5aaae955968dbc89825a2c5..e67455efc84f1e06d3396291d104ce65fee4591b 100644 +index 65dab533a33433bdd79601df4f109d9de6998fb8..5cb82901a5d0c8ee673501fc53389d526d4a5b6f 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -559,6 +559,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0452-Add-PlayerShieldDisableEvent.patch b/patches/api/0451-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/api/0452-Add-PlayerShieldDisableEvent.patch rename to patches/api/0451-Add-PlayerShieldDisableEvent.patch diff --git a/patches/api/0453-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0452-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch similarity index 100% rename from patches/api/0453-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch rename to patches/api/0452-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch diff --git a/patches/api/0454-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0453-Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/api/0454-Add-BlockStateMeta-clearBlockState.patch rename to patches/api/0453-Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/api/0455-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0454-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/api/0455-Expose-LootTable-of-DecoratedPot.patch rename to patches/api/0454-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/api/0456-Add-ShulkerDuplicateEvent.patch b/patches/api/0455-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/api/0456-Add-ShulkerDuplicateEvent.patch rename to patches/api/0455-Add-ShulkerDuplicateEvent.patch diff --git a/patches/api/0457-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0456-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/api/0457-Add-api-for-spawn-egg-texture-colors.patch rename to patches/api/0456-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/api/0458-Add-Lifecycle-Event-system.patch b/patches/api/0457-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/api/0458-Add-Lifecycle-Event-system.patch rename to patches/api/0457-Add-Lifecycle-Event-system.patch diff --git a/patches/api/0459-Conduit-API.patch b/patches/api/0458-Conduit-API.patch similarity index 100% rename from patches/api/0459-Conduit-API.patch rename to patches/api/0458-Conduit-API.patch diff --git a/patches/api/0460-ItemStack-Tooltip-API.patch b/patches/api/0459-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/api/0460-ItemStack-Tooltip-API.patch rename to patches/api/0459-ItemStack-Tooltip-API.patch diff --git a/patches/api/0461-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0460-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/api/0461-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/api/0460-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/api/0462-Add-FluidState-API.patch b/patches/api/0461-Add-FluidState-API.patch similarity index 100% rename from patches/api/0462-Add-FluidState-API.patch rename to patches/api/0461-Add-FluidState-API.patch diff --git a/patches/api/0463-add-number-format-api.patch b/patches/api/0462-add-number-format-api.patch similarity index 100% rename from patches/api/0463-add-number-format-api.patch rename to patches/api/0462-add-number-format-api.patch diff --git a/patches/api/0464-improve-BanList-types.patch b/patches/api/0463-improve-BanList-types.patch similarity index 100% rename from patches/api/0464-improve-BanList-types.patch rename to patches/api/0463-improve-BanList-types.patch diff --git a/patches/api/0465-Suspicious-Effect-Entry-API.patch b/patches/api/0464-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/api/0465-Suspicious-Effect-Entry-API.patch rename to patches/api/0464-Suspicious-Effect-Entry-API.patch diff --git a/patches/api/0466-Fix-DamageSource-API.patch b/patches/api/0465-Fix-DamageSource-API.patch similarity index 100% rename from patches/api/0466-Fix-DamageSource-API.patch rename to patches/api/0465-Fix-DamageSource-API.patch diff --git a/patches/api/0467-Expanded-Hopper-API.patch b/patches/api/0466-Expanded-Hopper-API.patch similarity index 100% rename from patches/api/0467-Expanded-Hopper-API.patch rename to patches/api/0466-Expanded-Hopper-API.patch diff --git a/patches/api/0468-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0467-Clone-mutables-to-prevent-unexpected-issues.patch similarity index 100% rename from patches/api/0468-Clone-mutables-to-prevent-unexpected-issues.patch rename to patches/api/0467-Clone-mutables-to-prevent-unexpected-issues.patch diff --git a/patches/server/0386-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0385-Add-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0386-Add-PlayerRecipeBookClickEvent.patch rename to patches/server/0385-Add-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0385-Improve-Arrow-API.patch b/patches/server/0385-Improve-Arrow-API.patch deleted file mode 100644 index cbf5d4d815..0000000000 --- a/patches/server/0385-Improve-Arrow-API.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nesaak <52047222+Nesaak@users.noreply.github.com> -Date: Sat, 23 May 2020 10:31:11 -0400 -Subject: [PATCH] Improve Arrow API - -Add method to get the arrow's itemstack and a method -to set the arrow's "noclip" status - -Co-authored-by: Jake Potrebic - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java -index 35d8fbd9c5751568a1a3b8928017e23cd41bb163..762c395e45a681a11f3fe9d10e7f0ba310786e80 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java -@@ -99,6 +99,23 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow { - this.getHandle().pickup = net.minecraft.world.entity.projectile.AbstractArrow.Pickup.byOrdinal(status.ordinal()); - } - -+ // Paper start -+ @Override -+ public org.bukkit.craftbukkit.inventory.CraftItemStack getItemStack() { -+ return org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(getHandle().getPickupItem()); -+ } -+ -+ @Override -+ public void setNoPhysics(boolean noPhysics) { -+ this.getHandle().setNoPhysics(noPhysics); -+ } -+ -+ @Override -+ public boolean hasNoPhysics() { -+ return this.getHandle().isNoPhysics(); -+ } -+ // Paper end -+ - @Override - public void setTicksLived(int value) { - super.setTicksLived(value); diff --git a/patches/server/0387-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0386-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0387-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0386-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0388-Add-permission-for-command-blocks.patch b/patches/server/0387-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0388-Add-permission-for-command-blocks.patch rename to patches/server/0387-Add-permission-for-command-blocks.patch diff --git a/patches/server/0389-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0388-Ensure-Entity-position-and-AABB-are-never-invalid.patch similarity index 97% rename from patches/server/0389-Ensure-Entity-position-and-AABB-are-never-invalid.patch rename to patches/server/0388-Ensure-Entity-position-and-AABB-are-never-invalid.patch index fb16bb47ac..ca8fc43bc6 100644 --- a/patches/server/0389-Ensure-Entity-position-and-AABB-are-never-invalid.patch +++ b/patches/server/0388-Ensure-Entity-position-and-AABB-are-never-invalid.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Entity position and AABB are never invalid Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9c9689f4deffed50df9aaca6e451228d17154b8c..11a9142962637af5e26939a5eb8f35ba5f205793 100644 +index 23ee63119d55b40829c03a855ae0f8b214674e10..0c6680bf15b57cf314638ab70d849e033719c0e1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -652,8 +652,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0390-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0389-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0390-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0389-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0391-Paper-dumpitem-command.patch b/patches/server/0390-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0391-Paper-dumpitem-command.patch rename to patches/server/0390-Paper-dumpitem-command.patch diff --git a/patches/server/0392-Improve-Legacy-Component-serialization-size.patch b/patches/server/0391-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0392-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0391-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0393-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0392-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0393-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0392-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0394-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0393-Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/server/0394-Add-BlockStateMeta-clearBlockState.patch rename to patches/server/0393-Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/server/0395-Support-old-UUID-format-for-NBT.patch b/patches/server/0394-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0395-Support-old-UUID-format-for-NBT.patch rename to patches/server/0394-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0396-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0395-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0396-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0395-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0397-Do-not-accept-invalid-client-settings.patch b/patches/server/0396-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0397-Do-not-accept-invalid-client-settings.patch rename to patches/server/0396-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0398-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0397-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0398-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0397-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0399-Add-entity-liquid-API.patch b/patches/server/0398-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0399-Add-entity-liquid-API.patch rename to patches/server/0398-Add-entity-liquid-API.patch diff --git a/patches/server/0400-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0399-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0400-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0399-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0401-Add-PrepareResultEvent.patch b/patches/server/0400-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0401-Add-PrepareResultEvent.patch rename to patches/server/0400-Add-PrepareResultEvent.patch diff --git a/patches/server/0402-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0401-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0402-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0401-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0403-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0402-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0403-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0402-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0404-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0403-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0404-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0403-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0405-Fix-SPIGOT-5989.patch b/patches/server/0404-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0405-Fix-SPIGOT-5989.patch rename to patches/server/0404-Fix-SPIGOT-5989.patch diff --git a/patches/server/0406-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0406-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0407-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0406-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0407-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0406-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0408-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0407-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0408-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0407-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0409-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0408-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0409-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0408-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0410-Fix-some-rails-connecting-improperly.patch b/patches/server/0409-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0410-Fix-some-rails-connecting-improperly.patch rename to patches/server/0409-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0411-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0410-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0411-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0410-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0412-Brand-support.patch b/patches/server/0411-Brand-support.patch similarity index 100% rename from patches/server/0412-Brand-support.patch rename to patches/server/0411-Brand-support.patch diff --git a/patches/server/0413-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0412-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0413-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0412-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0414-Don-t-require-FACING-data.patch b/patches/server/0413-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0414-Don-t-require-FACING-data.patch rename to patches/server/0413-Don-t-require-FACING-data.patch diff --git a/patches/server/0415-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0414-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0415-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0414-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0416-Add-moon-phase-API.patch b/patches/server/0415-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0416-Add-moon-phase-API.patch rename to patches/server/0415-Add-moon-phase-API.patch diff --git a/patches/server/0417-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0416-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0417-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0416-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0418-Prevent-headless-pistons-from-being-created.patch b/patches/server/0417-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0418-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0417-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0419-Add-BellRingEvent.patch b/patches/server/0418-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0419-Add-BellRingEvent.patch rename to patches/server/0418-Add-BellRingEvent.patch diff --git a/patches/server/0420-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0419-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0420-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0419-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0421-Buffer-joins-to-world.patch b/patches/server/0420-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0421-Buffer-joins-to-world.patch rename to patches/server/0420-Buffer-joins-to-world.patch diff --git a/patches/server/0422-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0421-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0422-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0421-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0423-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0422-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0423-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0422-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0424-Add-more-Evoker-API.patch b/patches/server/0423-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0424-Add-more-Evoker-API.patch rename to patches/server/0423-Add-more-Evoker-API.patch diff --git a/patches/server/0425-Add-methods-to-get-translation-keys.patch b/patches/server/0424-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0425-Add-methods-to-get-translation-keys.patch rename to patches/server/0424-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0426-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0425-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0426-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0425-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0427-Cache-block-data-strings.patch b/patches/server/0426-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0427-Cache-block-data-strings.patch rename to patches/server/0426-Cache-block-data-strings.patch diff --git a/patches/server/0428-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0427-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 98% rename from patches/server/0428-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0427-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index 5fb2dcfe1f..8d60c2216a 100644 --- a/patches/server/0428-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/server/0427-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -31,7 +31,7 @@ index 789576f8b7b3001c243972b320b7dffbbf3baa5f..3b73565d295c09a5ab0d610338498f01 } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 11a9142962637af5e26939a5eb8f35ba5f205793..f839ab6dea7f1efd59f22bcef91d4e279b1c232a 100644 +index 0c6680bf15b57cf314638ab70d849e033719c0e1..f45b148884b305628411d57f7662ea454fde3906 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -162,6 +162,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0429-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0428-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0429-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0428-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0430-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0429-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0430-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0429-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0431-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0430-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0431-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0430-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0432-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0431-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 94% rename from patches/server/0432-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0431-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch index 0710aed1e5..b01c302702 100644 --- a/patches/server/0432-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch +++ b/patches/server/0431-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f839ab6dea7f1efd59f22bcef91d4e279b1c232a..0281f4c4f7bc609ff7f35dcc8a7c13f6813d6548 100644 +index f45b148884b305628411d57f7662ea454fde3906..44610d4e3fb69e6cf5629d9e895e93d8dd5e09e9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4411,4 +4411,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0433-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0432-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0433-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0432-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0434-Entity-isTicking.patch b/patches/server/0433-Entity-isTicking.patch similarity index 94% rename from patches/server/0434-Entity-isTicking.patch rename to patches/server/0433-Entity-isTicking.patch index 2d53b98026..205f3da8d5 100644 --- a/patches/server/0434-Entity-isTicking.patch +++ b/patches/server/0433-Entity-isTicking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0281f4c4f7bc609ff7f35dcc8a7c13f6813d6548..f33067ea049793d898def3c83bff5b36490f8232 100644 +index 44610d4e3fb69e6cf5629d9e895e93d8dd5e09e9..2c0c41ae455ae5894e6bd85830741143c3d8aaa5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4416,5 +4416,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0435-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0434-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0435-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0434-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0436-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0435-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0436-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0435-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0437-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0436-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0437-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0436-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0438-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0437-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0438-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0437-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0439-Optimise-getType-calls.patch b/patches/server/0438-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0439-Optimise-getType-calls.patch rename to patches/server/0438-Optimise-getType-calls.patch diff --git a/patches/server/0440-Villager-resetOffers.patch b/patches/server/0439-Villager-resetOffers.patch similarity index 100% rename from patches/server/0440-Villager-resetOffers.patch rename to patches/server/0439-Villager-resetOffers.patch diff --git a/patches/server/0441-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0440-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0441-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0440-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0442-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0441-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0442-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0441-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0443-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0442-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0443-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0442-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0444-Fix-bell-block-entity-memory-leak.patch b/patches/server/0443-Fix-bell-block-entity-memory-leak.patch similarity index 100% rename from patches/server/0444-Fix-bell-block-entity-memory-leak.patch rename to patches/server/0443-Fix-bell-block-entity-memory-leak.patch diff --git a/patches/server/0445-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0444-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0445-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0444-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0446-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0445-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0446-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0445-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0447-Add-ignore-discounts-API.patch b/patches/server/0446-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0447-Add-ignore-discounts-API.patch rename to patches/server/0446-Add-ignore-discounts-API.patch diff --git a/patches/server/0448-Toggle-for-removing-existing-dragon.patch b/patches/server/0447-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0448-Toggle-for-removing-existing-dragon.patch rename to patches/server/0447-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0449-Fix-client-lag-on-advancement-loading.patch b/patches/server/0448-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0449-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0448-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0450-Item-no-age-no-player-pickup.patch b/patches/server/0449-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0450-Item-no-age-no-player-pickup.patch rename to patches/server/0449-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0451-Beacon-API-custom-effect-ranges.patch b/patches/server/0450-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0451-Beacon-API-custom-effect-ranges.patch rename to patches/server/0450-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0452-Add-API-for-quit-reason.patch b/patches/server/0451-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0452-Add-API-for-quit-reason.patch rename to patches/server/0451-Add-API-for-quit-reason.patch diff --git a/patches/server/0453-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0452-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0453-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0452-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0454-Expose-world-spawn-angle.patch b/patches/server/0453-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0454-Expose-world-spawn-angle.patch rename to patches/server/0453-Expose-world-spawn-angle.patch diff --git a/patches/server/0455-Add-Destroy-Speed-API.patch b/patches/server/0454-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0455-Add-Destroy-Speed-API.patch rename to patches/server/0454-Add-Destroy-Speed-API.patch diff --git a/patches/server/0456-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0455-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0456-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0455-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0457-Add-LivingEntity-clearActiveItem.patch b/patches/server/0456-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0457-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0456-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0458-Add-PlayerItemCooldownEvent.patch b/patches/server/0457-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0458-Add-PlayerItemCooldownEvent.patch rename to patches/server/0457-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0459-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0458-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0459-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0458-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0460-More-lightning-API.patch b/patches/server/0459-More-lightning-API.patch similarity index 100% rename from patches/server/0460-More-lightning-API.patch rename to patches/server/0459-More-lightning-API.patch diff --git a/patches/server/0461-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0460-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 98% rename from patches/server/0461-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0460-Climbing-should-not-bypass-cramming-gamerule.patch index e615ac322f..6d2f4c2108 100644 --- a/patches/server/0461-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0460-Climbing-should-not-bypass-cramming-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f33067ea049793d898def3c83bff5b36490f8232..3b9c691973f11b7d4db8fb77d2b02aa0d07ed7b5 100644 +index 2c0c41ae455ae5894e6bd85830741143c3d8aaa5..82ccfd91dfd3cce35a35edf8f73ccdd1ddd1fd6a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1983,6 +1983,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0462-Add-missing-default-perms-for-commands.patch b/patches/server/0461-Add-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0462-Add-missing-default-perms-for-commands.patch rename to patches/server/0461-Add-missing-default-perms-for-commands.patch diff --git a/patches/server/0463-Add-PlayerShearBlockEvent.patch b/patches/server/0462-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0463-Add-PlayerShearBlockEvent.patch rename to patches/server/0462-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0464-Limit-recipe-packets.patch b/patches/server/0463-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0464-Limit-recipe-packets.patch rename to patches/server/0463-Limit-recipe-packets.patch diff --git a/patches/server/0465-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0464-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0465-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0464-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0466-Player-Chunk-Load-Unload-Events.patch b/patches/server/0465-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0466-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0465-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0467-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0466-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0467-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0466-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0468-Expose-LivingEntity-hurt-direction.patch b/patches/server/0467-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0468-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0467-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0469-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0468-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0469-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0468-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0470-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0469-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch similarity index 100% rename from patches/server/0470-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch rename to patches/server/0469-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch diff --git a/patches/server/0471-Add-TargetHitEvent.patch b/patches/server/0470-Add-TargetHitEvent.patch similarity index 100% rename from patches/server/0471-Add-TargetHitEvent.patch rename to patches/server/0470-Add-TargetHitEvent.patch diff --git a/patches/server/0472-MC-4-Fix-item-position-desync.patch b/patches/server/0471-MC-4-Fix-item-position-desync.patch similarity index 96% rename from patches/server/0472-MC-4-Fix-item-position-desync.patch rename to patches/server/0471-MC-4-Fix-item-position-desync.patch index f1fa7d66d3..5b680e0dd0 100644 --- a/patches/server/0472-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0471-MC-4-Fix-item-position-desync.patch @@ -28,7 +28,7 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..3c4ac79c094dc2fff7de94150a34b7bf public Vec3 decode(long x, long y, long z) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3b9c691973f11b7d4db8fb77d2b02aa0d07ed7b5..df389ebaaef8ef307adb6c604ce22a192a522ba4 100644 +index 82ccfd91dfd3cce35a35edf8f73ccdd1ddd1fd6a..18cf11ddcf51e8b6251fd6df97f85e0ed15900c4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4186,6 +4186,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0473-Additional-Block-Material-API.patch b/patches/server/0472-Additional-Block-Material-API.patch similarity index 100% rename from patches/server/0473-Additional-Block-Material-API.patch rename to patches/server/0472-Additional-Block-Material-API.patch diff --git a/patches/server/0474-Fix-harming-potion-dupe.patch b/patches/server/0473-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0474-Fix-harming-potion-dupe.patch rename to patches/server/0473-Fix-harming-potion-dupe.patch diff --git a/patches/server/0475-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0474-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/server/0475-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/server/0474-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/server/0476-Cache-burn-durations.patch b/patches/server/0475-Cache-burn-durations.patch similarity index 100% rename from patches/server/0476-Cache-burn-durations.patch rename to patches/server/0475-Cache-burn-durations.patch diff --git a/patches/server/0477-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0476-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0477-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0476-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0478-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0477-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0478-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0477-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0479-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0478-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0479-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0478-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0480-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0479-Fix-interact-event-not-being-called-sometimes.patch similarity index 100% rename from patches/server/0480-Fix-interact-event-not-being-called-sometimes.patch rename to patches/server/0479-Fix-interact-event-not-being-called-sometimes.patch diff --git a/patches/server/0481-Zombie-API-breaking-doors.patch b/patches/server/0480-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0481-Zombie-API-breaking-doors.patch rename to patches/server/0480-Zombie-API-breaking-doors.patch diff --git a/patches/server/0482-Fix-nerfed-slime-when-splitting.patch b/patches/server/0481-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0482-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0481-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0483-Add-EntityLoadCrossbowEvent.patch b/patches/server/0482-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0483-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0482-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0484-Add-WorldGameRuleChangeEvent.patch b/patches/server/0483-Add-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0484-Add-WorldGameRuleChangeEvent.patch rename to patches/server/0483-Add-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0485-Add-ServerResourcesReloadedEvent.patch b/patches/server/0484-Add-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0485-Add-ServerResourcesReloadedEvent.patch rename to patches/server/0484-Add-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0486-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0485-Add-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0486-Add-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0485-Add-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0487-Add-BlockFailedDispenseEvent.patch b/patches/server/0486-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0487-Add-BlockFailedDispenseEvent.patch rename to patches/server/0486-Add-BlockFailedDispenseEvent.patch diff --git a/patches/server/0488-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0487-Add-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0488-Add-PlayerLecternPageChangeEvent.patch rename to patches/server/0487-Add-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0489-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0488-Add-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0489-Add-PlayerLoomPatternSelectEvent.patch rename to patches/server/0488-Add-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0490-Configurable-door-breaking-difficulty.patch b/patches/server/0489-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0490-Configurable-door-breaking-difficulty.patch rename to patches/server/0489-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0491-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0490-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0491-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0490-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0492-Remove-stale-POIs.patch b/patches/server/0491-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0492-Remove-stale-POIs.patch rename to patches/server/0491-Remove-stale-POIs.patch diff --git a/patches/server/0493-Fix-villager-boat-exploit.patch b/patches/server/0492-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0493-Fix-villager-boat-exploit.patch rename to patches/server/0492-Fix-villager-boat-exploit.patch diff --git a/patches/server/0494-Add-sendOpLevel-API.patch b/patches/server/0493-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0494-Add-sendOpLevel-API.patch rename to patches/server/0493-Add-sendOpLevel-API.patch diff --git a/patches/server/0495-TODO-Registry-Modification-API.patch b/patches/server/0494-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0495-TODO-Registry-Modification-API.patch rename to patches/server/0494-TODO-Registry-Modification-API.patch diff --git a/patches/server/0496-Add-StructuresLocateEvent.patch b/patches/server/0495-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0496-Add-StructuresLocateEvent.patch rename to patches/server/0495-Add-StructuresLocateEvent.patch diff --git a/patches/server/0497-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0496-Collision-option-for-requiring-a-player-participant.patch similarity index 97% rename from patches/server/0497-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0496-Collision-option-for-requiring-a-player-participant.patch index c029c3a902..176ae99bc8 100644 --- a/patches/server/0497-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0496-Collision-option-for-requiring-a-player-participant.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index df389ebaaef8ef307adb6c604ce22a192a522ba4..fa5d634cefcf73afd3e090f91c4c589edb988352 100644 +index 18cf11ddcf51e8b6251fd6df97f85e0ed15900c4..2d8c476eb9f329ee6827340b6cec26a84901c56a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1848,6 +1848,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0498-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0497-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0498-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0497-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0499-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0498-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0499-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0498-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0500-Make-schedule-command-per-world.patch b/patches/server/0499-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0500-Make-schedule-command-per-world.patch rename to patches/server/0499-Make-schedule-command-per-world.patch diff --git a/patches/server/0501-Configurable-max-leash-distance.patch b/patches/server/0500-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0501-Configurable-max-leash-distance.patch rename to patches/server/0500-Configurable-max-leash-distance.patch diff --git a/patches/server/0502-Add-BlockPreDispenseEvent.patch b/patches/server/0501-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0502-Add-BlockPreDispenseEvent.patch rename to patches/server/0501-Add-BlockPreDispenseEvent.patch diff --git a/patches/server/0503-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0502-Add-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0503-Add-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0502-Add-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0504-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0503-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0504-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0503-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0505-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0504-Add-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0505-Add-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0504-Add-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0506-Expand-EntityUnleashEvent.patch b/patches/server/0505-Expand-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0506-Expand-EntityUnleashEvent.patch rename to patches/server/0505-Expand-EntityUnleashEvent.patch diff --git a/patches/server/0507-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0506-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0507-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0506-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0508-Add-DragonEggFormEvent.patch b/patches/server/0507-Add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0508-Add-DragonEggFormEvent.patch rename to patches/server/0507-Add-DragonEggFormEvent.patch diff --git a/patches/server/0509-Add-EntityMoveEvent.patch b/patches/server/0508-Add-EntityMoveEvent.patch similarity index 100% rename from patches/server/0509-Add-EntityMoveEvent.patch rename to patches/server/0508-Add-EntityMoveEvent.patch diff --git a/patches/server/0510-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0509-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0510-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0509-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0511-Inline-shift-direction-fields.patch b/patches/server/0510-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0511-Inline-shift-direction-fields.patch rename to patches/server/0510-Inline-shift-direction-fields.patch diff --git a/patches/server/0512-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0511-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0512-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0511-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0513-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0512-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0513-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0512-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0514-living-entity-allow-attribute-registration.patch b/patches/server/0513-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0514-living-entity-allow-attribute-registration.patch rename to patches/server/0513-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0515-fix-dead-slime-setSize-invincibility.patch b/patches/server/0514-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0515-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0514-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0516-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0515-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0516-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0515-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0517-Expose-Tracked-Players.patch b/patches/server/0516-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0517-Expose-Tracked-Players.patch rename to patches/server/0516-Expose-Tracked-Players.patch diff --git a/patches/server/0518-Improve-ServerGUI.patch b/patches/server/0517-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0518-Improve-ServerGUI.patch rename to patches/server/0517-Improve-ServerGUI.patch diff --git a/patches/server/0519-fix-converting-txt-to-json-file.patch b/patches/server/0518-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0519-fix-converting-txt-to-json-file.patch rename to patches/server/0518-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0520-Add-worldborder-events.patch b/patches/server/0519-Add-worldborder-events.patch similarity index 100% rename from patches/server/0520-Add-worldborder-events.patch rename to patches/server/0519-Add-worldborder-events.patch diff --git a/patches/server/0521-Add-PlayerNameEntityEvent.patch b/patches/server/0520-Add-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0521-Add-PlayerNameEntityEvent.patch rename to patches/server/0520-Add-PlayerNameEntityEvent.patch diff --git a/patches/server/0522-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0521-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0522-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0521-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0523-Add-recipe-to-cook-events.patch b/patches/server/0522-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0523-Add-recipe-to-cook-events.patch rename to patches/server/0522-Add-recipe-to-cook-events.patch diff --git a/patches/server/0524-Add-Block-isValidTool.patch b/patches/server/0523-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0524-Add-Block-isValidTool.patch rename to patches/server/0523-Add-Block-isValidTool.patch diff --git a/patches/server/0525-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0524-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0525-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0524-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0526-Expand-world-key-API.patch b/patches/server/0525-Expand-world-key-API.patch similarity index 100% rename from patches/server/0526-Expand-world-key-API.patch rename to patches/server/0525-Expand-world-key-API.patch diff --git a/patches/server/0527-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0526-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0527-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0526-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0528-Item-Rarity-API.patch b/patches/server/0527-Item-Rarity-API.patch similarity index 100% rename from patches/server/0528-Item-Rarity-API.patch rename to patches/server/0527-Item-Rarity-API.patch diff --git a/patches/server/0529-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0528-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0529-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0528-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0530-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0529-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0530-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0529-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0531-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0530-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0531-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0530-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0532-Expose-protocol-version.patch b/patches/server/0531-Expose-protocol-version.patch similarity index 100% rename from patches/server/0532-Expose-protocol-version.patch rename to patches/server/0531-Expose-protocol-version.patch diff --git a/patches/server/0533-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0532-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0533-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0532-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0534-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0533-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0534-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0533-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0535-Add-bypass-host-check.patch b/patches/server/0534-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0535-Add-bypass-host-check.patch rename to patches/server/0534-Add-bypass-host-check.patch diff --git a/patches/server/0536-Set-area-affect-cloud-rotation.patch b/patches/server/0535-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0536-Set-area-affect-cloud-rotation.patch rename to patches/server/0535-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0537-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0536-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0537-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0536-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0538-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0537-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0538-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0537-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0539-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0538-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0539-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0538-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0540-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0539-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0540-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0539-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0541-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0540-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0541-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0540-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0542-Add-PlayerDeepSleepEvent.patch b/patches/server/0541-Add-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0542-Add-PlayerDeepSleepEvent.patch rename to patches/server/0541-Add-PlayerDeepSleepEvent.patch diff --git a/patches/server/0543-More-World-API.patch b/patches/server/0542-More-World-API.patch similarity index 100% rename from patches/server/0543-More-World-API.patch rename to patches/server/0542-More-World-API.patch diff --git a/patches/server/0544-Add-PlayerBedFailEnterEvent.patch b/patches/server/0543-Add-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0544-Add-PlayerBedFailEnterEvent.patch rename to patches/server/0543-Add-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0545-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0544-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0545-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0544-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0546-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0545-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch similarity index 100% rename from patches/server/0546-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch rename to patches/server/0545-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch diff --git a/patches/server/0547-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0546-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0547-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0546-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0548-Add-Channel-initialization-listeners.patch b/patches/server/0547-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0548-Add-Channel-initialization-listeners.patch rename to patches/server/0547-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0549-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0549-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0550-Add-more-WanderingTrader-API.patch b/patches/server/0549-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0550-Add-more-WanderingTrader-API.patch rename to patches/server/0549-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0551-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0550-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0551-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0550-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0552-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0552-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0553-Add-HiddenPotionEffect-API.patch b/patches/server/0552-Add-HiddenPotionEffect-API.patch similarity index 100% rename from patches/server/0553-Add-HiddenPotionEffect-API.patch rename to patches/server/0552-Add-HiddenPotionEffect-API.patch diff --git a/patches/server/0554-Inventory-close.patch b/patches/server/0553-Inventory-close.patch similarity index 100% rename from patches/server/0554-Inventory-close.patch rename to patches/server/0553-Inventory-close.patch diff --git a/patches/server/0555-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0555-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0556-Add-basic-Datapack-API.patch b/patches/server/0555-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0556-Add-basic-Datapack-API.patch rename to patches/server/0555-Add-basic-Datapack-API.patch diff --git a/patches/server/0557-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0556-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0557-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0556-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0558-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0557-Expand-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0558-Expand-PlayerGameModeChangeEvent.patch rename to patches/server/0557-Expand-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0559-ItemStack-repair-check-API.patch b/patches/server/0558-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0559-ItemStack-repair-check-API.patch rename to patches/server/0558-ItemStack-repair-check-API.patch diff --git a/patches/server/0560-More-Enchantment-API.patch b/patches/server/0559-More-Enchantment-API.patch similarity index 100% rename from patches/server/0560-More-Enchantment-API.patch rename to patches/server/0559-More-Enchantment-API.patch diff --git a/patches/server/0561-Move-range-check-for-block-placing-up.patch b/patches/server/0560-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0561-Move-range-check-for-block-placing-up.patch rename to patches/server/0560-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0562-Add-Mob-lookAt-API.patch b/patches/server/0561-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0562-Add-Mob-lookAt-API.patch rename to patches/server/0561-Add-Mob-lookAt-API.patch diff --git a/patches/server/0563-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch similarity index 100% rename from patches/server/0563-Correctly-check-if-bucket-dispenses-will-succeed-for.patch rename to patches/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch diff --git a/patches/server/0564-Add-Unix-domain-socket-support.patch b/patches/server/0563-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0564-Add-Unix-domain-socket-support.patch rename to patches/server/0563-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0565-Add-EntityInsideBlockEvent.patch b/patches/server/0564-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0565-Add-EntityInsideBlockEvent.patch rename to patches/server/0564-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0566-Attributes-API-for-item-defaults.patch b/patches/server/0565-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0566-Attributes-API-for-item-defaults.patch rename to patches/server/0565-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0567-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0567-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0568-More-Lidded-Block-API.patch b/patches/server/0567-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0568-More-Lidded-Block-API.patch rename to patches/server/0567-More-Lidded-Block-API.patch diff --git a/patches/server/0569-Limit-item-frame-cursors-on-maps.patch b/patches/server/0568-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0569-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0568-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0570-Add-PlayerKickEvent-causes.patch b/patches/server/0569-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0570-Add-PlayerKickEvent-causes.patch rename to patches/server/0569-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0571-Add-PufferFishStateChangeEvent.patch b/patches/server/0570-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0571-Add-PufferFishStateChangeEvent.patch rename to patches/server/0570-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0572-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0572-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0573-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0573-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0574-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0573-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0574-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0573-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0575-Add-BellRevealRaiderEvent.patch b/patches/server/0574-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0575-Add-BellRevealRaiderEvent.patch rename to patches/server/0574-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0576-Fix-invulnerable-end-crystals.patch b/patches/server/0575-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0576-Fix-invulnerable-end-crystals.patch rename to patches/server/0575-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0577-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0576-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0577-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0576-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0578-Fix-dangerous-end-portal-logic.patch b/patches/server/0577-Fix-dangerous-end-portal-logic.patch similarity index 97% rename from patches/server/0578-Fix-dangerous-end-portal-logic.patch rename to patches/server/0577-Fix-dangerous-end-portal-logic.patch index 3c92033da9..1b1c9918ec 100644 --- a/patches/server/0578-Fix-dangerous-end-portal-logic.patch +++ b/patches/server/0577-Fix-dangerous-end-portal-logic.patch @@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was designed to happen in the first place. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index fa5d634cefcf73afd3e090f91c4c589edb988352..e9a12d9b7c8789f3d07ba5a799c941ca25eb3e63 100644 +index 2d8c476eb9f329ee6827340b6cec26a84901c56a..e3647763bcede42f06250550985e149e39f2b0b8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -421,6 +421,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0579-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0579-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0580-Make-item-validations-configurable.patch b/patches/server/0579-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0580-Make-item-validations-configurable.patch rename to patches/server/0579-Make-item-validations-configurable.patch diff --git a/patches/server/0581-Line-Of-Sight-Changes.patch b/patches/server/0580-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0581-Line-Of-Sight-Changes.patch rename to patches/server/0580-Line-Of-Sight-Changes.patch diff --git a/patches/server/0582-add-per-world-spawn-limits.patch b/patches/server/0581-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0582-add-per-world-spawn-limits.patch rename to patches/server/0581-add-per-world-spawn-limits.patch diff --git a/patches/server/0583-Fix-potions-splash-events.patch b/patches/server/0582-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0583-Fix-potions-splash-events.patch rename to patches/server/0582-Fix-potions-splash-events.patch diff --git a/patches/server/0584-Add-more-LimitedRegion-API.patch b/patches/server/0583-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0584-Add-more-LimitedRegion-API.patch rename to patches/server/0583-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0585-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0585-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0586-Missing-Entity-API.patch b/patches/server/0585-Missing-Entity-API.patch similarity index 98% rename from patches/server/0586-Missing-Entity-API.patch rename to patches/server/0585-Missing-Entity-API.patch index b2f850af74..d12a12082a 100644 --- a/patches/server/0586-Missing-Entity-API.patch +++ b/patches/server/0585-Missing-Entity-API.patch @@ -39,6 +39,7 @@ Co-authored-by: booky10 Co-authored-by: Amin Co-authored-by: TrollyLoki Co-authored-by: FireInstall +Co-authored-by: maxcom1 <46265094+maxcom1@users.noreply.github.com> diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java index 8117578ced94aa6bf01871f6526a388385c4adf2..59699c59fdfc611177fdb3136f84ab539b17d9c9 100644 @@ -670,26 +671,36 @@ index fc0f0e841dc974d080e1abb9bbafb5165801131f..d657fd2c507a5b215aeab0a5f3e9c2ee + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 07158732dd6a5b7d622b7f2ea10ca87b50365b8a..dd1ca63d2d6e4c8606c28380f81b79b7ee211a35 100644 +index 07158732dd6a5b7d622b7f2ea10ca87b50365b8a..ebbefcdea6356384f27e964bd551bad2f9e696e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1078,4 +1078,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1078,4 +1078,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return set; } // Paper end + -+ // Paper start - move up invisibility ++ // Paper start - missing entity api + @Override -+ public boolean isInvisible() { ++ public boolean isInvisible() { // Paper - moved up from LivingEntity + return this.getHandle().isInvisible(); + } + + @Override -+ public void setInvisible(boolean invisible) { ++ public void setInvisible(boolean invisible) { // Paper - moved up from LivingEntity + this.getHandle().persistentInvisibility = invisible; + this.getHandle().setSharedFlag(Entity.FLAG_INVISIBLE, invisible); + } -+ // Paper end - move up invisibility ++ ++ @Override ++ public void setNoPhysics(boolean noPhysics) { ++ this.getHandle().noPhysics = noPhysics; ++ } ++ ++ @Override ++ public boolean hasNoPhysics() { ++ return this.getHandle().noPhysics; ++ } ++ // Paper end - missing entity api } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java index 73cb7aa01af3eed71b05b1a539f082b26dcd8d60..e1a2f0924da6ebcdf332040f922226af5d8a2d45 100644 diff --git a/patches/server/0587-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0587-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0588-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0588-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0589-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0589-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0590-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0589-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0590-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0589-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0591-Add-PlayerArmSwingEvent.patch b/patches/server/0590-Add-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0591-Add-PlayerArmSwingEvent.patch rename to patches/server/0590-Add-PlayerArmSwingEvent.patch diff --git a/patches/server/0592-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0591-Fix-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0592-Fix-kick-event-leave-message-not-being-sent.patch rename to patches/server/0591-Fix-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0593-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0592-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0593-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0592-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0594-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0593-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0594-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0593-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0595-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0595-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0596-Add-missing-forceDrop-toggles.patch b/patches/server/0595-Add-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0596-Add-missing-forceDrop-toggles.patch rename to patches/server/0595-Add-missing-forceDrop-toggles.patch diff --git a/patches/server/0597-Stinger-API.patch b/patches/server/0596-Stinger-API.patch similarity index 95% rename from patches/server/0597-Stinger-API.patch rename to patches/server/0596-Stinger-API.patch index 262a4a8481..d5e15af3c0 100644 --- a/patches/server/0597-Stinger-API.patch +++ b/patches/server/0596-Stinger-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 9a7a670c1e99674e8a554342165b7b77001083fc..e1092bb514e01e978a8d624bd5a7cba5b4b5fe81 100644 +index 6218f15194b7ae0b17f7f1dab78b1337779edb27..9fed7d8500481493de32efd16de6b271b9ed446d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -338,6 +338,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0598-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0598-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0599-Add-System.out-err-catcher.patch b/patches/server/0598-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0599-Add-System.out-err-catcher.patch rename to patches/server/0598-Add-System.out-err-catcher.patch diff --git a/patches/server/0600-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0600-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0601-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0601-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0602-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0602-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0603-Add-PlayerSetSpawnEvent.patch b/patches/server/0602-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0603-Add-PlayerSetSpawnEvent.patch rename to patches/server/0602-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0604-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 94% rename from patches/server/0604-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch index 77dfd12340..0de1d33a58 100644 --- a/patches/server/0604-Make-hoppers-respect-inventory-max-stack-size.patch +++ b/patches/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make hoppers respect inventory max stack size diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 8aabefdcbeb3fc5fb7d11fe04ee629fe7bc612c2..4dda44608320c2a872b23053a1c3de63b79741c2 100644 +index f0b4b8eb5d2740cd73b4338fd0c2acc3b06df1f6..e3b6f2bf93710ea695b0c25c0b6968a8f24f0829 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -438,15 +438,17 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen diff --git a/patches/server/0605-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0604-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0605-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0604-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0606-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0605-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0606-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0605-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0607-Add-EntityDamageItemEvent.patch b/patches/server/0606-Add-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0607-Add-EntityDamageItemEvent.patch rename to patches/server/0606-Add-EntityDamageItemEvent.patch diff --git a/patches/server/0608-Optimize-indirect-passenger-iteration.patch b/patches/server/0607-Optimize-indirect-passenger-iteration.patch similarity index 96% rename from patches/server/0608-Optimize-indirect-passenger-iteration.patch rename to patches/server/0607-Optimize-indirect-passenger-iteration.patch index 92ffa35c2c..cdd80aa9b6 100644 --- a/patches/server/0608-Optimize-indirect-passenger-iteration.patch +++ b/patches/server/0607-Optimize-indirect-passenger-iteration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e9a12d9b7c8789f3d07ba5a799c941ca25eb3e63..96ed3d345085c7d86643166fb4c124675e6b07d4 100644 +index e3647763bcede42f06250550985e149e39f2b0b8..f93e74226e3306a59e17dce1e4f8e72d61d75d49 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3842,20 +3842,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0609-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0608-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0609-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0608-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0610-Clear-bucket-NBT-after-dispense.patch b/patches/server/0609-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0610-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0609-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0611-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0610-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0611-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0610-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0612-Add-BlockBreakBlockEvent.patch b/patches/server/0611-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0612-Add-BlockBreakBlockEvent.patch rename to patches/server/0611-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0613-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0613-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0614-More-CommandBlock-API.patch b/patches/server/0613-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0614-More-CommandBlock-API.patch rename to patches/server/0613-More-CommandBlock-API.patch diff --git a/patches/server/0615-Add-missing-team-sidebar-display-slots.patch b/patches/server/0614-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0615-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0614-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0616-Add-back-EntityPortalExitEvent.patch b/patches/server/0615-Add-back-EntityPortalExitEvent.patch similarity index 97% rename from patches/server/0616-Add-back-EntityPortalExitEvent.patch rename to patches/server/0615-Add-back-EntityPortalExitEvent.patch index 5e091febda..566d9576da 100644 --- a/patches/server/0616-Add-back-EntityPortalExitEvent.patch +++ b/patches/server/0615-Add-back-EntityPortalExitEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 96ed3d345085c7d86643166fb4c124675e6b07d4..822666e1199e0851136d88b2b556d8d17843d902 100644 +index f93e74226e3306a59e17dce1e4f8e72d61d75d49..7dbbf0884b70acb37c3400364736fa8f6b68c964 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3291,6 +3291,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0617-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0617-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0618-Get-entity-default-attributes.patch b/patches/server/0617-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0618-Get-entity-default-attributes.patch rename to patches/server/0617-Get-entity-default-attributes.patch diff --git a/patches/server/0619-Left-handed-API.patch b/patches/server/0618-Left-handed-API.patch similarity index 100% rename from patches/server/0619-Left-handed-API.patch rename to patches/server/0618-Left-handed-API.patch diff --git a/patches/server/0620-Add-more-advancement-API.patch b/patches/server/0619-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0620-Add-more-advancement-API.patch rename to patches/server/0619-Add-more-advancement-API.patch diff --git a/patches/server/0621-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0620-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0621-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0620-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0622-Add-critical-damage-API.patch b/patches/server/0621-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0622-Add-critical-damage-API.patch rename to patches/server/0621-Add-critical-damage-API.patch diff --git a/patches/server/0623-Fix-issues-with-mob-conversion.patch b/patches/server/0622-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0623-Fix-issues-with-mob-conversion.patch rename to patches/server/0622-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0624-Add-isCollidable-methods-to-various-places.patch b/patches/server/0623-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0624-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0623-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0625-Goat-ram-API.patch b/patches/server/0624-Goat-ram-API.patch similarity index 100% rename from patches/server/0625-Goat-ram-API.patch rename to patches/server/0624-Goat-ram-API.patch diff --git a/patches/server/0626-Add-API-for-resetting-a-single-score.patch b/patches/server/0625-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0626-Add-API-for-resetting-a-single-score.patch rename to patches/server/0625-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0626-Add-Raw-Byte-Entity-Serialization.patch similarity index 97% rename from patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0626-Add-Raw-Byte-Entity-Serialization.patch index b57a9d9bb2..ad5e5a0031 100644 --- a/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/server/0626-Add-Raw-Byte-Entity-Serialization.patch @@ -27,7 +27,7 @@ index 7dbbf0884b70acb37c3400364736fa8f6b68c964..5dce3d38ecd7b7639f02f3e1e92f3723 return this.isPassenger() ? false : this.saveAsPassenger(nbt); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 08d63e104ddc079af6349b6b3665cadae1c619ad..6a31fb773798e911e731c35e2d52eb1073ed9f07 100644 +index ebbefcdea6356384f27e964bd551bad2f9e696e8..06febdb103f98dd16cca32d7345b0ca6b52dcade 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1077,6 +1077,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -46,7 +46,7 @@ index 08d63e104ddc079af6349b6b3665cadae1c619ad..6a31fb773798e911e731c35e2d52eb10 + } // Paper end - // Paper start - move up invisibility + // Paper start - missing entity api diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java index 609b103cb9af3b0554bf1116306874fe98c8534c..3f582c5653e13875cce4ef8ecd279d8a3d2b2dc2 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java diff --git a/patches/server/0628-Vanilla-command-permission-fixes.patch b/patches/server/0627-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0628-Vanilla-command-permission-fixes.patch rename to patches/server/0627-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0629-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0629-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0630-Fix-GameProfileCache-concurrency.patch b/patches/server/0629-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0630-Fix-GameProfileCache-concurrency.patch rename to patches/server/0629-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0631-Improve-and-expand-AsyncCatcher.patch b/patches/server/0630-Improve-and-expand-AsyncCatcher.patch similarity index 99% rename from patches/server/0631-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0630-Improve-and-expand-AsyncCatcher.patch index 70908f281c..3da2f1c96b 100644 --- a/patches/server/0631-Improve-and-expand-AsyncCatcher.patch +++ b/patches/server/0630-Improve-and-expand-AsyncCatcher.patch @@ -202,7 +202,7 @@ index ca68faef4232859e833adfd86a0ce13f7c2ad00e..df57157317fc6c84f69751fd8a120761 ClientboundSoundEntityPacket packet = new ClientboundSoundEntityPacket(Holder.direct(SoundEvent.createVariableRangeEvent(new ResourceLocation(sound))), net.minecraft.sounds.SoundSource.valueOf(category.name()), craftEntity.getHandle(), volume, pitch, seed); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index e1092bb514e01e978a8d624bd5a7cba5b4b5fe81..1170cf9b3b61fae099ed8574888187cf4f20ffd1 100644 +index 9fed7d8500481493de32efd16de6b271b9ed446d..a67570fedb8f09a118351b1b5c3d47bc568f5c0c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -501,6 +501,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0632-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0632-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0633-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0632-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0633-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0632-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0634-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0633-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0634-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0633-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0635-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0635-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0636-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0636-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0637-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0637-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0638-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch similarity index 100% rename from patches/server/0638-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch rename to patches/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch diff --git a/patches/server/0639-Time-scoreboard-search.patch b/patches/server/0638-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0639-Time-scoreboard-search.patch rename to patches/server/0638-Time-scoreboard-search.patch diff --git a/patches/server/0640-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0639-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0640-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0639-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0641-Add-missing-InventoryType.patch b/patches/server/0640-Add-missing-InventoryType.patch similarity index 100% rename from patches/server/0641-Add-missing-InventoryType.patch rename to patches/server/0640-Add-missing-InventoryType.patch diff --git a/patches/server/0642-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0642-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0643-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0643-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0644-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0643-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0644-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0643-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0645-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0645-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0646-Add-packet-limiter-config.patch b/patches/server/0645-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0646-Add-packet-limiter-config.patch rename to patches/server/0645-Add-packet-limiter-config.patch diff --git a/patches/server/0647-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0647-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0648-Ensure-valid-vehicle-status.patch b/patches/server/0647-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0648-Ensure-valid-vehicle-status.patch rename to patches/server/0647-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0649-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0648-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0649-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0648-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0650-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0650-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0651-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0650-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0651-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0650-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0652-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0651-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0652-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0651-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0653-Preserve-overstacked-loot.patch b/patches/server/0652-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0653-Preserve-overstacked-loot.patch rename to patches/server/0652-Preserve-overstacked-loot.patch diff --git a/patches/server/0654-Update-head-rotation-in-missing-places.patch b/patches/server/0653-Update-head-rotation-in-missing-places.patch similarity index 93% rename from patches/server/0654-Update-head-rotation-in-missing-places.patch rename to patches/server/0653-Update-head-rotation-in-missing-places.patch index d43abb0d8a..5fdcb1a6cb 100644 --- a/patches/server/0654-Update-head-rotation-in-missing-places.patch +++ b/patches/server/0653-Update-head-rotation-in-missing-places.patch @@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw. This issue only applies to players. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e6ef67a7a2eab5314c95e751895b4d4ce71c91b8..efdc94c6e57dcd5c122300f77ca0cc058651aa7e 100644 +index 5dce3d38ecd7b7639f02f3e1e92f3723f4a42c39..ec23aa4f86fed6890273d06b8cfb4000daf3c515 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1790,6 +1790,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0655-prevent-unintended-light-block-manipulation.patch b/patches/server/0654-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0655-prevent-unintended-light-block-manipulation.patch rename to patches/server/0654-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0656-Fix-CraftCriteria-defaults-map.patch b/patches/server/0655-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0656-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0655-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0657-Fix-upstreams-block-state-factories.patch b/patches/server/0656-Fix-upstreams-block-state-factories.patch similarity index 99% rename from patches/server/0657-Fix-upstreams-block-state-factories.patch rename to patches/server/0656-Fix-upstreams-block-state-factories.patch index cd44e53b99..b930948485 100644 --- a/patches/server/0657-Fix-upstreams-block-state-factories.patch +++ b/patches/server/0656-Fix-upstreams-block-state-factories.patch @@ -26,7 +26,7 @@ index 53443b472d21633f49c102b330c8406c92f09d8d..4893eaf93738da860014ddf3ad003334 if (state instanceof InventoryHolder) return (InventoryHolder) state; return null; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index f1f6d85399db86ce7aee1fccde51d6259b427e7e..53d466bfa66573f178fd0e0247bcefc04902c38f 100644 +index ff3f88f107a4c059688566b69dcdf48bc01210ab..7cd0fae59c497861063827eda4243cc6c11e7cff 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -13,7 +13,7 @@ import org.bukkit.persistence.PersistentDataContainer; diff --git a/patches/server/0658-Configurable-feature-seeds.patch b/patches/server/0657-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0658-Configurable-feature-seeds.patch rename to patches/server/0657-Configurable-feature-seeds.patch diff --git a/patches/server/0659-Add-root-admin-user-detection.patch b/patches/server/0658-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0659-Add-root-admin-user-detection.patch rename to patches/server/0658-Add-root-admin-user-detection.patch diff --git a/patches/server/0660-Always-allow-item-changing-in-Fireball.patch b/patches/server/0659-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0660-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0659-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0661-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0660-don-t-attempt-to-teleport-dead-entities.patch similarity index 91% rename from patches/server/0661-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0660-don-t-attempt-to-teleport-dead-entities.patch index 5eff5788eb..96f8ca01bb 100644 --- a/patches/server/0661-don-t-attempt-to-teleport-dead-entities.patch +++ b/patches/server/0660-don-t-attempt-to-teleport-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index efdc94c6e57dcd5c122300f77ca0cc058651aa7e..5691ce8e654b05d466f179f87b17cc627de98fcb 100644 +index ec23aa4f86fed6890273d06b8cfb4000daf3c515..a89cd343bee7ea919c3ba5789e37b05e6a1cf334 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -718,7 +718,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0662-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0662-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0663-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0663-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0664-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0663-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0664-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0663-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0665-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0665-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0666-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0665-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0666-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0665-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0667-Fix-Spigot-growth-modifiers.patch b/patches/server/0666-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0667-Fix-Spigot-growth-modifiers.patch rename to patches/server/0666-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0668-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0668-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0669-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0668-Add-PlayerItemFrameChangeEvent.patch similarity index 97% rename from patches/server/0669-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0668-Add-PlayerItemFrameChangeEvent.patch index e46cc3be4c..7dd61945d1 100644 --- a/patches/server/0669-Add-PlayerItemFrameChangeEvent.patch +++ b/patches/server/0668-Add-PlayerItemFrameChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerItemFrameChangeEvent diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index 8289ea080aa297f75cdbc8d591d6efa6a0def0ea..3ff1ae5ae705cd8d5c8529e1dcdd5ccaed908830 100644 +index 5c507b1160835fd4beb3b2d5b621250540545d4e..ab85050a64d4897aff11d0780d8cb26660918ac7 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java @@ -3,6 +3,7 @@ package net.minecraft.world.entity.decoration; diff --git a/patches/server/0670-Optimize-HashMapPalette.patch b/patches/server/0669-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0670-Optimize-HashMapPalette.patch rename to patches/server/0669-Optimize-HashMapPalette.patch diff --git a/patches/server/0671-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0671-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0672-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0672-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0673-Add-more-Campfire-API.patch b/patches/server/0672-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0673-Add-more-Campfire-API.patch rename to patches/server/0672-Add-more-Campfire-API.patch diff --git a/patches/server/0674-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0674-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0675-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0674-Forward-CraftEntity-in-teleport-command.patch similarity index 95% rename from patches/server/0675-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0674-Forward-CraftEntity-in-teleport-command.patch index 493db169a4..18a8c45967 100644 --- a/patches/server/0675-Forward-CraftEntity-in-teleport-command.patch +++ b/patches/server/0674-Forward-CraftEntity-in-teleport-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5691ce8e654b05d466f179f87b17cc627de98fcb..653b5bedf9b6132a5410be5f9c36a36cf99b6f68 100644 +index a89cd343bee7ea919c3ba5789e37b05e6a1cf334..6c8478c9ad154b25e11085ac47552b5855b5e9d1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3263,6 +3263,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0676-Improve-scoreboard-entries.patch b/patches/server/0675-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0676-Improve-scoreboard-entries.patch rename to patches/server/0675-Improve-scoreboard-entries.patch diff --git a/patches/server/0677-Entity-powdered-snow-API.patch b/patches/server/0676-Entity-powdered-snow-API.patch similarity index 92% rename from patches/server/0677-Entity-powdered-snow-API.patch rename to patches/server/0676-Entity-powdered-snow-API.patch index e06e388df9..60a2d3839b 100644 --- a/patches/server/0677-Entity-powdered-snow-API.patch +++ b/patches/server/0676-Entity-powdered-snow-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Entity powdered snow API public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 6a31fb773798e911e731c35e2d52eb1073ed9f07..6a8251ae85f192925493b3e084c0e53820a9be97 100644 +index 06febdb103f98dd16cca32d7345b0ca6b52dcade..8f0df02a81c36244a3906efa6605f5eba030bfb9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1087,6 +1087,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -21,7 +21,7 @@ index 6a31fb773798e911e731c35e2d52eb1073ed9f07..6a8251ae85f192925493b3e084c0e538 + } // Paper end - // Paper start - move up invisibility + // Paper start - missing entity api diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java index a0ea54181de6c6685deef265cbe9f66aabbca42b..6f98da9be6aef35e3b5c940188b872459a383c8e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java diff --git a/patches/server/0678-Add-API-for-item-entity-health.patch b/patches/server/0677-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0678-Add-API-for-item-entity-health.patch rename to patches/server/0677-Add-API-for-item-entity-health.patch diff --git a/patches/server/0679-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0678-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0679-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0678-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0680-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0680-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0681-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0681-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0682-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0682-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0683-Fix-bees-aging-inside-hives.patch b/patches/server/0682-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0683-Fix-bees-aging-inside-hives.patch rename to patches/server/0682-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0684-Bucketable-API.patch b/patches/server/0683-Bucketable-API.patch similarity index 100% rename from patches/server/0684-Bucketable-API.patch rename to patches/server/0683-Bucketable-API.patch diff --git a/patches/server/0685-Validate-usernames.patch b/patches/server/0684-Validate-usernames.patch similarity index 100% rename from patches/server/0685-Validate-usernames.patch rename to patches/server/0684-Validate-usernames.patch diff --git a/patches/server/0686-Make-water-animal-spawn-height-configurable.patch b/patches/server/0685-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0686-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0685-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0687-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0687-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0688-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0687-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0688-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0687-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0689-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0688-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch similarity index 100% rename from patches/server/0689-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch rename to patches/server/0688-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch diff --git a/patches/server/0690-Multiple-Entries-with-Scoreboards.patch b/patches/server/0689-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0690-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0689-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0691-Reset-placed-block-on-exception.patch b/patches/server/0690-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0691-Reset-placed-block-on-exception.patch rename to patches/server/0690-Reset-placed-block-on-exception.patch diff --git a/patches/server/0692-Add-configurable-height-for-slime-spawn.patch b/patches/server/0691-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0692-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0691-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0693-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0692-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0693-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0692-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0694-Multi-Block-Change-API-Implementation.patch b/patches/server/0693-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0694-Multi-Block-Change-API-Implementation.patch rename to patches/server/0693-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0695-Fix-NotePlayEvent.patch b/patches/server/0694-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0695-Fix-NotePlayEvent.patch rename to patches/server/0694-Fix-NotePlayEvent.patch diff --git a/patches/server/0696-Freeze-Tick-Lock-API.patch b/patches/server/0695-Freeze-Tick-Lock-API.patch similarity index 95% rename from patches/server/0696-Freeze-Tick-Lock-API.patch rename to patches/server/0695-Freeze-Tick-Lock-API.patch index 7ca49418f1..65e67e5965 100644 --- a/patches/server/0696-Freeze-Tick-Lock-API.patch +++ b/patches/server/0695-Freeze-Tick-Lock-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 653b5bedf9b6132a5410be5f9c36a36cf99b6f68..80d5a7a77fab3b978ee4a1a76b992eb666486792 100644 +index 6c8478c9ad154b25e11085ac47552b5855b5e9d1..7e6ea850078179f7c63b597a788ef105802a0260 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -405,6 +405,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -59,7 +59,7 @@ index 9af308ef5e55df9ce08b25e358e48d1c6f67d663..511e8e789932df77999689659d1efbe3 if (this.isInPowderSnow && this.canFreeze()) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 71f9b7bbbabae9291fdb9f902f3f69c13e715c0e..a5a9c34709d3bb716e2dc9bb6bd548992df74f46 100644 +index 8f0df02a81c36244a3906efa6605f5eba030bfb9..88e05b8ec5f442b3ad14e3b39a06beeca5c169ae 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -321,6 +321,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0697-More-PotionEffectType-API.patch b/patches/server/0696-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0697-More-PotionEffectType-API.patch rename to patches/server/0696-More-PotionEffectType-API.patch diff --git a/patches/server/0698-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0698-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0699-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0698-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0699-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0698-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0700-Add-missing-structure-set-seed-configs.patch b/patches/server/0699-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0700-Add-missing-structure-set-seed-configs.patch rename to patches/server/0699-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0701-Implement-regenerateChunk.patch b/patches/server/0700-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0701-Implement-regenerateChunk.patch rename to patches/server/0700-Implement-regenerateChunk.patch diff --git a/patches/server/0702-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0702-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0703-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0703-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0704-Add-GameEvent-tags.patch b/patches/server/0703-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0704-Add-GameEvent-tags.patch rename to patches/server/0703-Add-GameEvent-tags.patch diff --git a/patches/server/0705-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0705-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0706-Furnace-RecipesUsed-API.patch b/patches/server/0705-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0706-Furnace-RecipesUsed-API.patch rename to patches/server/0705-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0707-Configurable-sculk-sensor-listener-range.patch b/patches/server/0706-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0707-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0706-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0708-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0707-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0708-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0707-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0709-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0709-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0710-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0709-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0710-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0709-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0711-Fix-Entity-Position-Desync.patch b/patches/server/0710-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0711-Fix-Entity-Position-Desync.patch rename to patches/server/0710-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0712-Custom-Potion-Mixes.patch b/patches/server/0711-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0712-Custom-Potion-Mixes.patch rename to patches/server/0711-Custom-Potion-Mixes.patch diff --git a/patches/server/0713-Force-close-world-loading-screen.patch b/patches/server/0712-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0713-Force-close-world-loading-screen.patch rename to patches/server/0712-Force-close-world-loading-screen.patch diff --git a/patches/server/0714-Fix-falling-block-spawn-methods.patch b/patches/server/0713-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0714-Fix-falling-block-spawn-methods.patch rename to patches/server/0713-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0715-Expose-furnace-minecart-push-values.patch b/patches/server/0714-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0715-Expose-furnace-minecart-push-values.patch rename to patches/server/0714-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0716-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0715-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0716-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0715-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0717-More-Projectile-API.patch b/patches/server/0716-More-Projectile-API.patch similarity index 97% rename from patches/server/0717-More-Projectile-API.patch rename to patches/server/0716-More-Projectile-API.patch index ef828fda14..30d520d8be 100644 --- a/patches/server/0717-More-Projectile-API.patch +++ b/patches/server/0716-More-Projectile-API.patch @@ -133,7 +133,7 @@ index 91c2d0b40d3fca86938cd454e1415a4eea3df7c7..c1c52f4fc5f900fac4098e5e37c52dfc + // Paper end - More projectile API } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java -index 762c395e45a681a11f3fe9d10e7f0ba310786e80..6d2fe30742f8b41d53dd2cbff120fcc042ea0e0c 100644 +index 35d8fbd9c5751568a1a3b8928017e23cd41bb163..3a749f78be3968e499e096196eaaa0b433a53c06 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java @@ -58,20 +58,7 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow { @@ -158,10 +158,17 @@ index 762c395e45a681a11f3fe9d10e7f0ba310786e80..6d2fe30742f8b41d53dd2cbff120fcc0 @Override public boolean isInBlock() { -@@ -105,6 +92,27 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow { - return org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(getHandle().getPickupItem()); +@@ -99,6 +86,35 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow { + this.getHandle().pickup = net.minecraft.world.entity.projectile.AbstractArrow.Pickup.byOrdinal(status.ordinal()); } ++ // Paper start ++ @Override ++ @org.jetbrains.annotations.NotNull ++ public org.bukkit.craftbukkit.inventory.CraftItemStack getItemStack() { ++ return org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(getHandle().getPickupItem()); ++ } ++ + @Override + public void setLifetimeTicks(int ticks) { + this.getHandle().life = ticks; @@ -182,12 +189,13 @@ index 762c395e45a681a11f3fe9d10e7f0ba310786e80..6d2fe30742f8b41d53dd2cbff120fcc0 + public void setHitSound(@org.jetbrains.annotations.NotNull org.bukkit.Sound sound) { + this.getHandle().setSoundEvent(org.bukkit.craftbukkit.CraftSound.bukkitToMinecraft(sound)); + } ++ // Paper end + @Override - public void setNoPhysics(boolean noPhysics) { - this.getHandle().setNoPhysics(noPhysics); + public void setTicksLived(int value) { + super.setTicksLived(value); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java -index 73cb7aa01af3eed71b05b1a539f082b26dcd8d60..2783e218d5e5c24787429237974e196761f4d02b 100644 +index e1a2f0924da6ebcdf332040f922226af5d8a2d45..a8699b274b51c5f6691557c3c3db88436f05e304 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java @@ -32,20 +32,7 @@ public class CraftFireball extends AbstractProjectile implements Fireball { diff --git a/patches/server/0718-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0717-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0718-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0717-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0719-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0718-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0719-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0718-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0720-Implement-getComputedBiome-API.patch b/patches/server/0719-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0720-Implement-getComputedBiome-API.patch rename to patches/server/0719-Implement-getComputedBiome-API.patch diff --git a/patches/server/0721-Make-some-itemstacks-nonnull.patch b/patches/server/0720-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0721-Make-some-itemstacks-nonnull.patch rename to patches/server/0720-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0722-Implement-enchantWithLevels-API.patch b/patches/server/0721-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0722-Implement-enchantWithLevels-API.patch rename to patches/server/0721-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0723-Fix-saving-in-unloadWorld.patch b/patches/server/0722-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0723-Fix-saving-in-unloadWorld.patch rename to patches/server/0722-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0724-Buffer-OOB-setBlock-calls.patch b/patches/server/0723-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0724-Buffer-OOB-setBlock-calls.patch rename to patches/server/0723-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0725-Add-TameableDeathMessageEvent.patch b/patches/server/0724-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0725-Add-TameableDeathMessageEvent.patch rename to patches/server/0724-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0726-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0725-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0726-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0725-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0727-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0726-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0727-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0726-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0728-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0727-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 91% rename from patches/server/0728-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0727-Ensure-entity-passenger-world-matches-ridden-entity.patch index 846f0c230c..a841c24fcd 100644 --- a/patches/server/0728-Ensure-entity-passenger-world-matches-ridden-entity.patch +++ b/patches/server/0727-Ensure-entity-passenger-world-matches-ridden-entity.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity Bad plugins doing this would cause some obvious problems... diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 80d5a7a77fab3b978ee4a1a76b992eb666486792..3d0f7310840742a5b16f0c0a7115dc0c90202919 100644 +index 7e6ea850078179f7c63b597a788ef105802a0260..2476b3fa3ecd976c6f6fb27dc3ad815bbab0165f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2580,7 +2580,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0729-cache-resource-keys.patch b/patches/server/0728-cache-resource-keys.patch similarity index 100% rename from patches/server/0729-cache-resource-keys.patch rename to patches/server/0728-cache-resource-keys.patch diff --git a/patches/server/0730-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0729-Allow-changing-the-EnderDragon-podium.patch similarity index 100% rename from patches/server/0730-Allow-changing-the-EnderDragon-podium.patch rename to patches/server/0729-Allow-changing-the-EnderDragon-podium.patch diff --git a/patches/server/0731-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0730-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0731-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0730-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0732-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0731-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0732-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0731-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0733-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0732-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0733-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0732-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0734-Expand-PlayerItemDamageEvent.patch b/patches/server/0733-Expand-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0734-Expand-PlayerItemDamageEvent.patch rename to patches/server/0733-Expand-PlayerItemDamageEvent.patch diff --git a/patches/server/0735-WorldCreator-keepSpawnLoaded.patch b/patches/server/0734-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0735-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0734-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0736-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0735-Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/server/0736-Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/server/0735-Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/server/0737-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0736-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0737-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0736-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0738-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0737-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0738-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0737-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0739-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0738-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0739-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0738-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0740-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0739-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0740-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0739-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0741-Add-PlayerStopUsingItemEvent.patch b/patches/server/0740-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0741-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0740-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0742-Don-t-tick-markers.patch b/patches/server/0741-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0742-Don-t-tick-markers.patch rename to patches/server/0741-Don-t-tick-markers.patch diff --git a/patches/server/0743-Expand-FallingBlock-API.patch b/patches/server/0742-Expand-FallingBlock-API.patch similarity index 100% rename from patches/server/0743-Expand-FallingBlock-API.patch rename to patches/server/0742-Expand-FallingBlock-API.patch diff --git a/patches/server/0744-Add-support-for-Proxy-Protocol.patch b/patches/server/0743-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0744-Add-support-for-Proxy-Protocol.patch rename to patches/server/0743-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0745-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0744-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0745-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0744-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0746-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0745-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0746-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0745-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0747-properly-read-and-store-sus-effect-duration.patch b/patches/server/0746-properly-read-and-store-sus-effect-duration.patch similarity index 100% rename from patches/server/0747-properly-read-and-store-sus-effect-duration.patch rename to patches/server/0746-properly-read-and-store-sus-effect-duration.patch diff --git a/patches/server/0748-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0747-Sanitize-sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0748-Sanitize-sent-BlockEntity-NBT.patch rename to patches/server/0747-Sanitize-sent-BlockEntity-NBT.patch diff --git a/patches/server/0749-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0748-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0749-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0748-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0750-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0749-Prevent-entity-loading-causing-async-lookups.patch similarity index 97% rename from patches/server/0750-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0749-Prevent-entity-loading-causing-async-lookups.patch index c9ec6cc4c0..17a6ab001e 100644 --- a/patches/server/0750-Prevent-entity-loading-causing-async-lookups.patch +++ b/patches/server/0749-Prevent-entity-loading-causing-async-lookups.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3d0f7310840742a5b16f0c0a7115dc0c90202919..45712b358e97b65396f63b34c09debc1d42fdbb9 100644 +index 2476b3fa3ecd976c6f6fb27dc3ad815bbab0165f..455cfdc2ce0960347605e149b88afab5ad8a3b05 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -727,6 +727,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0751-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0750-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0751-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0750-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0752-Dont-resent-entity-on-art-update.patch b/patches/server/0751-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0752-Dont-resent-entity-on-art-update.patch rename to patches/server/0751-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0753-Add-WardenAngerChangeEvent.patch b/patches/server/0752-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0753-Add-WardenAngerChangeEvent.patch rename to patches/server/0752-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0754-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0753-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0754-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0753-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0755-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0754-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0755-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0754-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0756-Nameable-Banner-API.patch b/patches/server/0755-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0756-Nameable-Banner-API.patch rename to patches/server/0755-Nameable-Banner-API.patch diff --git a/patches/server/0757-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0756-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0757-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0756-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0758-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0757-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0758-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0757-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0759-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0758-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0759-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0758-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0760-Add-Player-getFishHook.patch b/patches/server/0759-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0760-Add-Player-getFishHook.patch rename to patches/server/0759-Add-Player-getFishHook.patch diff --git a/patches/server/0761-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0760-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0761-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0760-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0762-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0761-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 98% rename from patches/server/0762-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0761-Add-various-missing-EntityDropItemEvent-calls.patch index ad1ba5c540..a4e7c5b7d4 100644 --- a/patches/server/0762-Add-various-missing-EntityDropItemEvent-calls.patch +++ b/patches/server/0761-Add-various-missing-EntityDropItemEvent-calls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 45712b358e97b65396f63b34c09debc1d42fdbb9..e5b15ef69bedfd94398f1a8d7a84d0fbf3773919 100644 +index 455cfdc2ce0960347605e149b88afab5ad8a3b05..007e5fc95dd5cb3973f45fd6a435cc102d133728 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2491,6 +2491,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0763-Fix-Bee-flower-NPE.patch b/patches/server/0762-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0763-Fix-Bee-flower-NPE.patch rename to patches/server/0762-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0764-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0763-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0764-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0763-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0765-More-Teleport-API.patch b/patches/server/0764-More-Teleport-API.patch similarity index 99% rename from patches/server/0765-More-Teleport-API.patch rename to patches/server/0764-More-Teleport-API.patch index aa88800118..c593fa72c5 100644 --- a/patches/server/0765-More-Teleport-API.patch +++ b/patches/server/0764-More-Teleport-API.patch @@ -29,7 +29,7 @@ index 5775d071f714e7b9d959bfa94510b865f489e68e..27eb4bc4d1276ea36b97d0faeed2acee d0 = to.getX(); d1 = to.getY(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index a5a9c34709d3bb716e2dc9bb6bd548992df74f46..9ea189c26c6a5fae84bcc7ed098426d8c001cd5e 100644 +index 88e05b8ec5f442b3ad14e3b39a06beeca5c169ae..70c1b20c2b25fbe53255f1753d86570c975767ab 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -219,15 +219,36 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0766-Add-EntityPortalReadyEvent.patch b/patches/server/0765-Add-EntityPortalReadyEvent.patch similarity index 95% rename from patches/server/0766-Add-EntityPortalReadyEvent.patch rename to patches/server/0765-Add-EntityPortalReadyEvent.patch index 1d064ea6c7..41d4a4e570 100644 --- a/patches/server/0766-Add-EntityPortalReadyEvent.patch +++ b/patches/server/0765-Add-EntityPortalReadyEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e5b15ef69bedfd94398f1a8d7a84d0fbf3773919..45a7b217ab6ef3a7c4ad1c07824d7185d4847086 100644 +index 007e5fc95dd5cb3973f45fd6a435cc102d133728..06fbea11c20db3a1585b969b1578073821c5b316 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2832,6 +2832,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0767-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0766-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0767-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0766-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0768-Send-block-entities-after-destroy-prediction.patch b/patches/server/0767-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0768-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0767-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0769-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0768-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0769-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0768-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0770-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0769-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0770-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0769-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0771-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0770-Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0771-Add-and-fix-missing-BlockFadeEvents.patch rename to patches/server/0770-Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/server/0772-Collision-API.patch b/patches/server/0771-Collision-API.patch similarity index 90% rename from patches/server/0772-Collision-API.patch rename to patches/server/0771-Collision-API.patch index da2d02ef43..8cc69f84e5 100644 --- a/patches/server/0772-Collision-API.patch +++ b/patches/server/0771-Collision-API.patch @@ -22,13 +22,13 @@ index fbcf1320ef9c1817b24aa8724cd6cf07319c20b9..5680e9772a2d90e997d2d0aacdda9edd // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index a47e8994b52576d88fa90b7a86cbe0fb7493fa6d..3cdc8787c6a481da6cb294208eebce0636a58d4f 100644 +index 70c1b20c2b25fbe53255f1753d86570c975767ab..254df37281a358cc0ac99b46f34daf2fd9774d5a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1138,4 +1138,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { - this.getHandle().setSharedFlag(Entity.FLAG_INVISIBLE, invisible); +@@ -1148,4 +1148,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { + return this.getHandle().noPhysics; } - // Paper end - move up invisibility + // Paper end - missing entity api + + // Paper start - Collision API + @Override diff --git a/patches/server/0773-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0772-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0773-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0772-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0774-Block-Ticking-API.patch b/patches/server/0773-Block-Ticking-API.patch similarity index 100% rename from patches/server/0774-Block-Ticking-API.patch rename to patches/server/0773-Block-Ticking-API.patch diff --git a/patches/server/0775-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0774-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0775-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0774-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0776-Add-NamespacedKey-biome-methods.patch b/patches/server/0775-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0776-Add-NamespacedKey-biome-methods.patch rename to patches/server/0775-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0777-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0776-Fix-plugin-loggers-on-server-shutdown.patch similarity index 96% rename from patches/server/0777-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0776-Fix-plugin-loggers-on-server-shutdown.patch index f27e838474..4f2b23f29b 100644 --- a/patches/server/0777-Fix-plugin-loggers-on-server-shutdown.patch +++ b/patches/server/0776-Fix-plugin-loggers-on-server-shutdown.patch @@ -49,7 +49,7 @@ index ab1f4e62b2ffed99b47ae23cae172f20ed586b27..97dbe5a44d2791c6dee830654c3935f4 } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index db6398c1822f6ad499feddd6a915984ef9917777..d931a4c6e633bf9c1b3e5e18e880e2ddbfe4aa2a 100644 +index 44f49cc8b7800eebda426a1a04a311979e4516b9..b131a84865d9160d1b5d411515b69e967dbda66c 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -18,6 +18,12 @@ public class Main { diff --git a/patches/server/0778-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0777-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0778-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0777-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0779-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0778-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0779-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0778-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0780-Missing-eating-regain-reason.patch b/patches/server/0779-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0780-Missing-eating-regain-reason.patch rename to patches/server/0779-Missing-eating-regain-reason.patch diff --git a/patches/server/0781-Missing-effect-cause.patch b/patches/server/0780-Missing-effect-cause.patch similarity index 100% rename from patches/server/0781-Missing-effect-cause.patch rename to patches/server/0780-Missing-effect-cause.patch diff --git a/patches/server/0782-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0781-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0782-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0781-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0783-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0782-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 97% rename from patches/server/0783-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0782-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch index ff24a5400c..e097dea832 100644 --- a/patches/server/0783-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch +++ b/patches/server/0782-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 1170cf9b3b61fae099ed8574888187cf4f20ffd1..e559af05c58b7d9c940cea9f48c0f4bd0aad756c 100644 +index a67570fedb8f09a118351b1b5c3d47bc568f5c0c..354c32f67d06228477c723f7e4dbe27116e59a9b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -546,8 +546,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0784-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0783-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0784-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0783-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0785-Configurable-chat-thread-limit.patch b/patches/server/0784-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0785-Configurable-chat-thread-limit.patch rename to patches/server/0784-Configurable-chat-thread-limit.patch diff --git a/patches/server/0786-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0785-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0786-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0785-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0787-fix-Jigsaw-block-kicking-user.patch b/patches/server/0786-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0787-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0786-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0788-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0787-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0788-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0787-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0789-Add-getDrops-to-BlockState.patch b/patches/server/0788-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0789-Add-getDrops-to-BlockState.patch rename to patches/server/0788-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0790-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0789-Fix-a-bunch-of-vanilla-bugs.patch similarity index 99% rename from patches/server/0790-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0789-Fix-a-bunch-of-vanilla-bugs.patch index abd857f514..80d7e8f072 100644 --- a/patches/server/0790-Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/0789-Fix-a-bunch-of-vanilla-bugs.patch @@ -317,7 +317,7 @@ index 56cc6ecf7f95687db7c7c062b4ee979bfe49844b..94dd97662ba07689fbfa16ef5c7d99fe public void equipArmor(Player player, ItemStack stack) { diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index 3ff1ae5ae705cd8d5c8529e1dcdd5ccaed908830..0c952bfc01b367a297e81768cab436c5474830f1 100644 +index ab85050a64d4897aff11d0780d8cb26660918ac7..bfb9694087821de206fafe867f207e07a4a6a988 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java @@ -282,6 +282,14 @@ public class ItemFrame extends HangingEntity { diff --git a/patches/server/0791-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0790-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0791-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0790-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0792-Fix-custom-piglin-loved-items.patch b/patches/server/0791-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0792-Fix-custom-piglin-loved-items.patch rename to patches/server/0791-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0793-EntityPickupItemEvent-fixes.patch b/patches/server/0792-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0793-EntityPickupItemEvent-fixes.patch rename to patches/server/0792-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0794-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0793-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0794-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0793-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0795-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0794-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0795-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0794-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0796-Elder-Guardian-appearance-API.patch b/patches/server/0795-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0796-Elder-Guardian-appearance-API.patch rename to patches/server/0795-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0797-Allow-changing-bed-s-occupied-property.patch b/patches/server/0796-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0797-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0796-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0798-Add-entity-knockback-API.patch b/patches/server/0797-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0798-Add-entity-knockback-API.patch rename to patches/server/0797-Add-entity-knockback-API.patch diff --git a/patches/server/0799-Detect-headless-JREs.patch b/patches/server/0798-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0799-Detect-headless-JREs.patch rename to patches/server/0798-Detect-headless-JREs.patch diff --git a/patches/server/0800-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0799-fix-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0800-fix-entity-vehicle-collision-event-not-called.patch rename to patches/server/0799-fix-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0801-Add-EntityToggleSitEvent.patch b/patches/server/0800-Add-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0801-Add-EntityToggleSitEvent.patch rename to patches/server/0800-Add-EntityToggleSitEvent.patch diff --git a/patches/server/0802-Add-fire-tick-delay-option.patch b/patches/server/0801-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0802-Add-fire-tick-delay-option.patch rename to patches/server/0801-Add-fire-tick-delay-option.patch diff --git a/patches/server/0803-Add-Moving-Piston-API.patch b/patches/server/0802-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0803-Add-Moving-Piston-API.patch rename to patches/server/0802-Add-Moving-Piston-API.patch diff --git a/patches/server/0804-Ignore-impossible-spawn-tick.patch b/patches/server/0803-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0804-Ignore-impossible-spawn-tick.patch rename to patches/server/0803-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0805-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0804-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0805-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0804-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0806-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0805-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0806-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0805-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0807-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0806-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 95% rename from patches/server/0807-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0806-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch index efc81025ac..9908d15463 100644 --- a/patches/server/0807-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch +++ b/patches/server/0806-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 45a7b217ab6ef3a7c4ad1c07824d7185d4847086..ea65396e55476dc4e91fe2c26a5c5bd658184d5e 100644 +index 06fbea11c20db3a1585b969b1578073821c5b316..3778d900c272a815e67f79c6d2827be2bbe8195f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3111,6 +3111,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0808-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0807-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0808-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0807-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0809-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0808-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0809-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0808-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0810-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0809-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 94% rename from patches/server/0810-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0809-fix-MC-252817-green-map-markers-do-not-disappear.patch index 6f61c88362..025e7cbcea 100644 --- a/patches/server/0810-fix-MC-252817-green-map-markers-do-not-disappear.patch +++ b/patches/server/0809-fix-MC-252817-green-map-markers-do-not-disappear.patch @@ -6,7 +6,7 @@ Subject: [PATCH] fix MC-252817 (green map markers do not disappear). this bug is caused by the fact that the itemframe's item is set to empty before the green marker is requested to be removed. this is fixed by getting the mapid from this method's parameter, rather than the air block now stored by the item frame. diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index 0c952bfc01b367a297e81768cab436c5474830f1..0cd57021cf308984415ca670f727ae61ac343fe7 100644 +index bfb9694087821de206fafe867f207e07a4a6a988..e875196824ef9618a52ca3f172f202d5584990df 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java @@ -291,7 +291,9 @@ public class ItemFrame extends HangingEntity { diff --git a/patches/server/0811-Add-Player-Warden-Warning-API.patch b/patches/server/0810-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0811-Add-Player-Warden-Warning-API.patch rename to patches/server/0810-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0812-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0811-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0812-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0811-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0813-Add-paper-dumplisteners-command.patch b/patches/server/0812-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0813-Add-paper-dumplisteners-command.patch rename to patches/server/0812-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0814-check-global-player-list-where-appropriate.patch b/patches/server/0813-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0814-check-global-player-list-where-appropriate.patch rename to patches/server/0813-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0815-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0814-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0815-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0814-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0816-ItemStack-damage-API.patch b/patches/server/0815-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0816-ItemStack-damage-API.patch rename to patches/server/0815-ItemStack-damage-API.patch diff --git a/patches/server/0817-Friction-API.patch b/patches/server/0816-Friction-API.patch similarity index 100% rename from patches/server/0817-Friction-API.patch rename to patches/server/0816-Friction-API.patch diff --git a/patches/server/0818-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0817-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0818-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0817-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0819-Fix-player-kick-on-shutdown.patch b/patches/server/0818-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0819-Fix-player-kick-on-shutdown.patch rename to patches/server/0818-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0820-Sync-offhand-slot-in-menus.patch b/patches/server/0819-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0820-Sync-offhand-slot-in-menus.patch rename to patches/server/0819-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0821-Player-Entity-Tracking-Events.patch b/patches/server/0820-Player-Entity-Tracking-Events.patch similarity index 96% rename from patches/server/0821-Player-Entity-Tracking-Events.patch rename to patches/server/0820-Player-Entity-Tracking-Events.patch index 37d60f62c0..bcba3dec8b 100644 --- a/patches/server/0821-Player-Entity-Tracking-Events.patch +++ b/patches/server/0820-Player-Entity-Tracking-Events.patch @@ -21,7 +21,7 @@ index 43c8f6a0615f392cc560b2259b116cc9d5fba4e7..ca24463405f138deb882f319bf84696f } else if (this.seenBy.remove(player.connection)) { this.serverEntity.removePairing(player); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ea65396e55476dc4e91fe2c26a5c5bd658184d5e..e7b260c85ce8054f612089be5d39c5df35ab2d88 100644 +index 3778d900c272a815e67f79c6d2827be2bbe8195f..cce640b055932e2fe26800107ad699743324ee4f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3837,7 +3837,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0822-Limit-pet-look-distance.patch b/patches/server/0821-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0822-Limit-pet-look-distance.patch rename to patches/server/0821-Limit-pet-look-distance.patch diff --git a/patches/server/0823-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0822-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0823-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0822-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0824-fix-Instruments.patch b/patches/server/0823-fix-Instruments.patch similarity index 100% rename from patches/server/0824-fix-Instruments.patch rename to patches/server/0823-fix-Instruments.patch diff --git a/patches/server/0825-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0824-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0825-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0824-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0826-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0825-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0826-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0825-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0827-Add-BlockLockCheckEvent.patch b/patches/server/0826-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0827-Add-BlockLockCheckEvent.patch rename to patches/server/0826-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0828-Add-Sneaking-API-for-Entities.patch b/patches/server/0827-Add-Sneaking-API-for-Entities.patch similarity index 91% rename from patches/server/0828-Add-Sneaking-API-for-Entities.patch rename to patches/server/0827-Add-Sneaking-API-for-Entities.patch index 675c2e6539..3c82fcadf9 100644 --- a/patches/server/0828-Add-Sneaking-API-for-Entities.patch +++ b/patches/server/0827-Add-Sneaking-API-for-Entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Sneaking API for Entities diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index b7fceba1c7138a5c1d78bf058c9f2d32dbc1d292..69dc7d9cc9ebd681d842099e2de521fd11ff5242 100644 +index 254df37281a358cc0ac99b46f34daf2fd9774d5a..b4ed7612a019a3d4d473dfbfed2067ea437fee06 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -872,6 +872,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0829-Improve-logging-and-errors.patch b/patches/server/0828-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0829-Improve-logging-and-errors.patch rename to patches/server/0828-Improve-logging-and-errors.patch diff --git a/patches/server/0830-Improve-PortalEvents.patch b/patches/server/0829-Improve-PortalEvents.patch similarity index 93% rename from patches/server/0830-Improve-PortalEvents.patch rename to patches/server/0829-Improve-PortalEvents.patch index c8e1fcfb1f..5ba3f4895a 100644 --- a/patches/server/0830-Improve-PortalEvents.patch +++ b/patches/server/0829-Improve-PortalEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e7b260c85ce8054f612089be5d39c5df35ab2d88..c4b925eaa94e48ffa04fb6fb9a5fa61f1d391ec8 100644 +index cce640b055932e2fe26800107ad699743324ee4f..66266651194cca02bf3814594e6f43b77741808c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3495,7 +3495,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0831-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0830-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0831-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0830-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0832-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0831-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0832-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0831-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0833-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0832-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0833-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0832-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0834-Flying-Fall-Damage.patch b/patches/server/0833-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0834-Flying-Fall-Damage.patch rename to patches/server/0833-Flying-Fall-Damage.patch diff --git a/patches/server/0835-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0834-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/server/0835-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/server/0834-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/server/0836-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0835-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 94% rename from patches/server/0836-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0835-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch index 02a7125dd4..b9fa911513 100644 --- a/patches/server/0836-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch +++ b/patches/server/0835-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c4b925eaa94e48ffa04fb6fb9a5fa61f1d391ec8..d24c2e23a12a196e1f6dc4f5c6d3c69472ddc704 100644 +index 66266651194cca02bf3814594e6f43b77741808c..cf2d4d56dfebeae2baa0712683102b163bdaa9ce 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -957,6 +957,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0837-config-for-disabling-entity-tag-tags.patch b/patches/server/0836-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0837-config-for-disabling-entity-tag-tags.patch rename to patches/server/0836-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0838-Use-single-player-info-update-packet-on-join.patch b/patches/server/0837-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0838-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0837-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0839-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0839-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0840-Win-Screen-API.patch b/patches/server/0839-Win-Screen-API.patch similarity index 100% rename from patches/server/0840-Win-Screen-API.patch rename to patches/server/0839-Win-Screen-API.patch diff --git a/patches/server/0841-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0840-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0841-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0840-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0842-Fix-force-opening-enchantment-tables.patch b/patches/server/0841-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0842-Fix-force-opening-enchantment-tables.patch rename to patches/server/0841-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0843-Add-Entity-Body-Yaw-API.patch b/patches/server/0842-Add-Entity-Body-Yaw-API.patch similarity index 94% rename from patches/server/0843-Add-Entity-Body-Yaw-API.patch rename to patches/server/0842-Add-Entity-Body-Yaw-API.patch index 526a085ebb..87974f97d5 100644 --- a/patches/server/0843-Add-Entity-Body-Yaw-API.patch +++ b/patches/server/0842-Add-Entity-Body-Yaw-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Entity Body Yaw API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 034bfd80ea7d1958eba3e057010379bf4b3661c9..dbb463e8aabe4afce6e119f0d91caff96911384d 100644 +index b4ed7612a019a3d4d473dfbfed2067ea437fee06..509550bbfb7c6bcff5dffa535f40af12aab898a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1136,6 +1136,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -39,7 +39,7 @@ index 034bfd80ea7d1958eba3e057010379bf4b3661c9..dbb463e8aabe4afce6e119f0d91caff9 + } // Paper end - // Paper start - move up invisibility + // Paper start - missing entity api diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index e8ef40fed546608d995fd31dc8a9721c00537749..fbe1d5051f8767db240e4d0c256f4a1088c4339c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java diff --git a/patches/server/0844-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0843-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0844-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0843-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0845-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0844-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0845-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0844-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0846-Add-EntityFertilizeEggEvent.patch b/patches/server/0845-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0846-Add-EntityFertilizeEggEvent.patch rename to patches/server/0845-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0847-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0846-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0847-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0846-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0848-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0847-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0848-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0847-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0849-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0848-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0849-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0848-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0850-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0849-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0850-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0849-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0851-Fix-text-display-error-on-spawn.patch b/patches/server/0850-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0851-Fix-text-display-error-on-spawn.patch rename to patches/server/0850-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0852-Fix-inventories-returning-null-Locations.patch b/patches/server/0851-Fix-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0852-Fix-inventories-returning-null-Locations.patch rename to patches/server/0851-Fix-inventories-returning-null-Locations.patch diff --git a/patches/server/0853-Add-Shearable-API.patch b/patches/server/0852-Add-Shearable-API.patch similarity index 100% rename from patches/server/0853-Add-Shearable-API.patch rename to patches/server/0852-Add-Shearable-API.patch diff --git a/patches/server/0854-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0853-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0854-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0853-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0855-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0854-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0855-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0854-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0856-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0855-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0856-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0855-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0857-remove-duplicate-animate-packet-for-records.patch b/patches/server/0856-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0857-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0856-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0858-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0857-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0858-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0857-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0859-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0858-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0859-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0858-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0860-Use-array-for-gamerule-storage.patch b/patches/server/0859-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0860-Use-array-for-gamerule-storage.patch rename to patches/server/0859-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0861-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0860-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0861-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0860-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0862-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0861-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0862-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0861-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0863-Add-Mob-Experience-reward-API.patch b/patches/server/0862-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0863-Add-Mob-Experience-reward-API.patch rename to patches/server/0862-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0864-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0863-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0864-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0863-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0865-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0864-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0865-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0864-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0866-More-accurate-isInOpenWater-impl.patch b/patches/server/0865-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0866-More-accurate-isInOpenWater-impl.patch rename to patches/server/0865-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0867-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0866-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0867-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0866-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0868-Expand-PlayerItemMendEvent.patch b/patches/server/0867-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0868-Expand-PlayerItemMendEvent.patch rename to patches/server/0867-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0868-Refresh-ProjectileSource-for-projectiles.patch similarity index 97% rename from patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0868-Refresh-ProjectileSource-for-projectiles.patch index 1e23e270a4..1dabec492f 100644 --- a/patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch +++ b/patches/server/0868-Refresh-ProjectileSource-for-projectiles.patch @@ -14,7 +14,7 @@ clearing the owner. Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d24c2e23a12a196e1f6dc4f5c6d3c69472ddc704..c173ecd1283331afcf4db010e65764e5ed6e1eff 100644 +index cf2d4d56dfebeae2baa0712683102b163bdaa9ce..0479dbdf0da7a06735ee08d068ead5fa12fc9860 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -384,6 +384,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0870-Add-transient-modifier-API.patch b/patches/server/0869-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0870-Add-transient-modifier-API.patch rename to patches/server/0869-Add-transient-modifier-API.patch diff --git a/patches/server/0871-Fix-block-place-logic.patch b/patches/server/0870-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0871-Fix-block-place-logic.patch rename to patches/server/0870-Fix-block-place-logic.patch diff --git a/patches/server/0872-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0871-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0872-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0871-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0872-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0872-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0874-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0873-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0874-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0873-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0875-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0874-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0875-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0874-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0876-Fix-sniffer-removeExploredLocation.patch b/patches/server/0875-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0876-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0875-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0877-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0876-Add-method-to-remove-all-active-potion-effects.patch similarity index 91% rename from patches/server/0877-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0876-Add-method-to-remove-all-active-potion-effects.patch index 20554be569..d2aa5b28fd 100644 --- a/patches/server/0877-Add-method-to-remove-all-active-potion-effects.patch +++ b/patches/server/0876-Add-method-to-remove-all-active-potion-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 3302d8e9b7c2c48b20dd257f4699b263d3bc52dc..3f952d1409118535f325f614f1a6507c40efa4d6 100644 +index fbe1d5051f8767db240e4d0c256f4a1088c4339c..993844ee3d76591be38e8d27eba37ff8723443b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -540,6 +540,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0878-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0877-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0878-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0877-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0879-Add-event-for-player-editing-sign.patch b/patches/server/0878-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0879-Add-event-for-player-editing-sign.patch rename to patches/server/0878-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0880-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0879-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0880-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0879-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0881-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0880-Fix-cmd-permission-levels-for-command-blocks.patch similarity index 100% rename from patches/server/0881-Fix-cmd-permission-levels-for-command-blocks.patch rename to patches/server/0880-Fix-cmd-permission-levels-for-command-blocks.patch diff --git a/patches/server/0882-Add-option-to-disable-block-updates.patch b/patches/server/0881-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0882-Add-option-to-disable-block-updates.patch rename to patches/server/0881-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0883-Call-missing-BlockDispenseEvent.patch b/patches/server/0882-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0883-Call-missing-BlockDispenseEvent.patch rename to patches/server/0882-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0884-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0883-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 90% rename from patches/server/0884-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0883-Don-t-load-chunks-for-supporting-block-checks.patch index 2fc45560a6..925e5e90ff 100644 --- a/patches/server/0884-Don-t-load-chunks-for-supporting-block-checks.patch +++ b/patches/server/0883-Don-t-load-chunks-for-supporting-block-checks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c173ecd1283331afcf4db010e65764e5ed6e1eff..626f2180b87daa1c00e97dc24b1a78aec4d9f033 100644 +index 0479dbdf0da7a06735ee08d068ead5fa12fc9860..927c298c1922fdd1016ffc72d2ca196adaccd377 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1200,7 +1200,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0885-Optimize-player-lookups-for-beacons.patch b/patches/server/0884-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0885-Optimize-player-lookups-for-beacons.patch rename to patches/server/0884-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0886-Add-Sign-getInteractableSideFor.patch b/patches/server/0885-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/server/0886-Add-Sign-getInteractableSideFor.patch rename to patches/server/0885-Add-Sign-getInteractableSideFor.patch diff --git a/patches/server/0887-Array-backed-synched-entity-data.patch b/patches/server/0886-Array-backed-synched-entity-data.patch similarity index 100% rename from patches/server/0887-Array-backed-synched-entity-data.patch rename to patches/server/0886-Array-backed-synched-entity-data.patch diff --git a/patches/server/0888-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0887-fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/0888-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0887-fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/0889-Fix-BanList-API.patch b/patches/server/0888-Fix-BanList-API.patch similarity index 100% rename from patches/server/0889-Fix-BanList-API.patch rename to patches/server/0888-Fix-BanList-API.patch diff --git a/patches/server/0890-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0889-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0890-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0889-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0891-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0890-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0891-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0890-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0892-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0891-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0892-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0891-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0893-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0892-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/server/0893-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0892-ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/server/0894-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0893-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0894-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0893-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0895-Add-whitelist-events.patch b/patches/server/0894-Add-whitelist-events.patch similarity index 100% rename from patches/server/0895-Add-whitelist-events.patch rename to patches/server/0894-Add-whitelist-events.patch diff --git a/patches/server/0896-Implement-PlayerFailMoveEvent.patch b/patches/server/0895-Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/server/0896-Implement-PlayerFailMoveEvent.patch rename to patches/server/0895-Implement-PlayerFailMoveEvent.patch diff --git a/patches/server/0897-Folia-scheduler-and-owned-region-API.patch b/patches/server/0896-Folia-scheduler-and-owned-region-API.patch similarity index 99% rename from patches/server/0897-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0896-Folia-scheduler-and-owned-region-API.patch index ec5f0abb4d..92d708382e 100644 --- a/patches/server/0897-Folia-scheduler-and-owned-region-API.patch +++ b/patches/server/0896-Folia-scheduler-and-owned-region-API.patch @@ -1185,7 +1185,7 @@ index 0747b0042446271385371f1ca9c8fefdebd851b8..fade1e36037075aae968eb90bbfeac76 this.players.remove(entityplayer); this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 626f2180b87daa1c00e97dc24b1a78aec4d9f033..abbd6a866b666978ce29211e4027f2b08b0c2e3d 100644 +index 927c298c1922fdd1016ffc72d2ca196adaccd377..ecd7deadbddeb9571b2b8975214e4167c8333ce0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -247,11 +247,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -1332,7 +1332,7 @@ index 56a6b3921c74bdeb27f8736302503bee1f731065..b5140b37d2161d89c6c5d6465949e96f ConfigurationSerialization.registerClass(CraftOfflinePlayer.class); ConfigurationSerialization.registerClass(CraftPlayerProfile.class); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index ba915f1b3cd00c8afe39ece9c9e68737673777f5..282a1cebc0cdb6253d024dd399ef794335883662 100644 +index 509550bbfb7c6bcff5dffa535f40af12aab898a8..8086eae45b03fd53bc7cac625b51fc10d8523f4f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -68,6 +68,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0898-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0897-Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/server/0898-Only-erase-allay-memory-on-non-item-targets.patch rename to patches/server/0897-Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/server/0899-API-for-updating-recipes-on-clients.patch b/patches/server/0898-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/server/0899-API-for-updating-recipes-on-clients.patch rename to patches/server/0898-API-for-updating-recipes-on-clients.patch diff --git a/patches/server/0900-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0899-Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/server/0900-Fix-rotation-when-spawning-display-entities.patch rename to patches/server/0899-Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/server/0901-Only-capture-actual-tree-growth.patch b/patches/server/0900-Only-capture-actual-tree-growth.patch similarity index 100% rename from patches/server/0901-Only-capture-actual-tree-growth.patch rename to patches/server/0900-Only-capture-actual-tree-growth.patch diff --git a/patches/server/0902-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0901-Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/server/0902-Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/server/0901-Use-correct-source-for-mushroom-block-spread-event.patch diff --git a/patches/server/0903-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0902-Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/server/0903-Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/server/0902-Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/server/0904-Use-correct-seed-on-api-world-load.patch b/patches/server/0903-Use-correct-seed-on-api-world-load.patch similarity index 100% rename from patches/server/0904-Use-correct-seed-on-api-world-load.patch rename to patches/server/0903-Use-correct-seed-on-api-world-load.patch diff --git a/patches/server/0905-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0904-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0905-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/0904-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0906-Cache-map-ids-on-item-frames.patch b/patches/server/0905-Cache-map-ids-on-item-frames.patch similarity index 96% rename from patches/server/0906-Cache-map-ids-on-item-frames.patch rename to patches/server/0905-Cache-map-ids-on-item-frames.patch index a65e4d7021..7966ccb012 100644 --- a/patches/server/0906-Cache-map-ids-on-item-frames.patch +++ b/patches/server/0905-Cache-map-ids-on-item-frames.patch @@ -18,7 +18,7 @@ index 1f0931bdd4d82c05d7b5f8b8e5c2cc6d23905c73..da45984c9b2d3a55256efddde9458050 if (worldmap != null) { diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index 0cd57021cf308984415ca670f727ae61ac343fe7..80303f9466b8c7097151be313afc9a383693d18a 100644 +index e875196824ef9618a52ca3f172f202d5584990df..c34701f95580e4cf45fe086115563127432a28c5 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java @@ -50,6 +50,7 @@ public class ItemFrame extends HangingEntity { diff --git a/patches/server/0907-Fix-custom-statistic-criteria-creation.patch b/patches/server/0906-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/server/0907-Fix-custom-statistic-criteria-creation.patch rename to patches/server/0906-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/server/0908-Bandaid-fix-for-Effect.patch b/patches/server/0907-Bandaid-fix-for-Effect.patch similarity index 100% rename from patches/server/0908-Bandaid-fix-for-Effect.patch rename to patches/server/0907-Bandaid-fix-for-Effect.patch diff --git a/patches/server/0909-SculkCatalyst-bloom-API.patch b/patches/server/0908-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0909-SculkCatalyst-bloom-API.patch rename to patches/server/0908-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0910-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0909-API-for-an-entity-s-scoreboard-name.patch similarity index 86% rename from patches/server/0910-API-for-an-entity-s-scoreboard-name.patch rename to patches/server/0909-API-for-an-entity-s-scoreboard-name.patch index a93b609b72..dbff93ae56 100644 --- a/patches/server/0910-API-for-an-entity-s-scoreboard-name.patch +++ b/patches/server/0909-API-for-an-entity-s-scoreboard-name.patch @@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different methods depending on the implementation of Entity you were working with. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 1de3a2ed64dcd222bc90d3917c08e12af56450b4..fd7a3176cdd07f50e4e56d98827672042cdf5944 100644 +index 8086eae45b03fd53bc7cac625b51fc10d8523f4f..d91d56175e91fb06138901bad56c1c2544b3d20e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1206,4 +1206,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1216,4 +1216,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return !this.getHandle().level().noCollision(this.getHandle(), aabb); } // Paper end - Collision API diff --git a/patches/server/0911-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0910-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/server/0911-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/0910-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/server/0912-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0911-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/server/0912-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/0911-Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/server/0913-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0912-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/server/0913-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/0912-Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/server/0914-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0913-Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/server/0914-Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/0913-Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/server/0915-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0914-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/server/0915-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/0914-Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/server/0916-Add-Listing-API-for-Player.patch b/patches/server/0915-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/server/0916-Add-Listing-API-for-Player.patch rename to patches/server/0915-Add-Listing-API-for-Player.patch diff --git a/patches/server/0917-Configurable-Region-Compression-Format.patch b/patches/server/0916-Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/server/0917-Configurable-Region-Compression-Format.patch rename to patches/server/0916-Configurable-Region-Compression-Format.patch diff --git a/patches/server/0918-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0917-Add-BlockFace-to-BlockDamageEvent.patch similarity index 100% rename from patches/server/0918-Add-BlockFace-to-BlockDamageEvent.patch rename to patches/server/0917-Add-BlockFace-to-BlockDamageEvent.patch diff --git a/patches/server/0919-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0918-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/0919-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/0918-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/0920-Expand-Pose-API.patch b/patches/server/0919-Expand-Pose-API.patch similarity index 91% rename from patches/server/0920-Expand-Pose-API.patch rename to patches/server/0919-Expand-Pose-API.patch index 660dffd43c..33bb7d2bc7 100644 --- a/patches/server/0920-Expand-Pose-API.patch +++ b/patches/server/0919-Expand-Pose-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index abbd6a866b666978ce29211e4027f2b08b0c2e3d..bbc3f09105b19eabd3ebb8b9589412b8871739a1 100644 +index ecd7deadbddeb9571b2b8975214e4167c8333ce0..4db254f76bc2fb9867441016b3ac4f45f19d3bea 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -419,6 +419,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -25,7 +25,7 @@ index abbd6a866b666978ce29211e4027f2b08b0c2e3d..bbc3f09105b19eabd3ebb8b9589412b8 if (pose == this.getPose()) { return; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index fec2f96cfc42559c44d5d2e907d0706c674dfda7..089eb25d532990773161063658f123f1e5bef2b3 100644 +index d91d56175e91fb06138901bad56c1c2544b3d20e..a81c8a9d76c1d9fdee19132a9a40ffc2ab4d107e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -897,6 +897,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0921-More-DragonBattle-API.patch b/patches/server/0920-More-DragonBattle-API.patch similarity index 100% rename from patches/server/0921-More-DragonBattle-API.patch rename to patches/server/0920-More-DragonBattle-API.patch diff --git a/patches/server/0922-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0921-Deep-clone-unhandled-nbt-tags.patch similarity index 100% rename from patches/server/0922-Deep-clone-unhandled-nbt-tags.patch rename to patches/server/0921-Deep-clone-unhandled-nbt-tags.patch diff --git a/patches/server/0923-Add-PlayerPickItemEvent.patch b/patches/server/0922-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/server/0923-Add-PlayerPickItemEvent.patch rename to patches/server/0922-Add-PlayerPickItemEvent.patch diff --git a/patches/server/0924-Allow-trident-custom-damage.patch b/patches/server/0923-Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/0924-Allow-trident-custom-damage.patch rename to patches/server/0923-Allow-trident-custom-damage.patch diff --git a/patches/server/0925-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0924-Expose-hand-in-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/0925-Expose-hand-in-BlockCanBuildEvent.patch rename to patches/server/0924-Expose-hand-in-BlockCanBuildEvent.patch diff --git a/patches/server/0926-Optimize-nearest-structure-border-iteration.patch b/patches/server/0925-Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/0926-Optimize-nearest-structure-border-iteration.patch rename to patches/server/0925-Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/0927-Implement-OfflinePlayer-isConnected.patch b/patches/server/0926-Implement-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/server/0927-Implement-OfflinePlayer-isConnected.patch rename to patches/server/0926-Implement-OfflinePlayer-isConnected.patch diff --git a/patches/server/0928-Fix-inventory-desync.patch b/patches/server/0927-Fix-inventory-desync.patch similarity index 100% rename from patches/server/0928-Fix-inventory-desync.patch rename to patches/server/0927-Fix-inventory-desync.patch diff --git a/patches/server/0929-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0928-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/server/0929-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/0928-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/server/0930-Configure-sniffer-egg-hatch-time.patch b/patches/server/0929-Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/0930-Configure-sniffer-egg-hatch-time.patch rename to patches/server/0929-Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/0931-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0930-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/server/0931-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/0930-Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/server/0932-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0931-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/0932-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/0931-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/0933-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0932-Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/server/0933-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/0932-Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/server/0934-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0933-Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/server/0934-Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/server/0933-Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/server/0935-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0934-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/server/0935-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/0934-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/server/0936-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0935-Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/server/0936-Fix-silent-equipment-change-for-mobs.patch rename to patches/server/0935-Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/server/0937-Fix-spigot-s-Forced-Stats.patch b/patches/server/0936-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/0937-Fix-spigot-s-Forced-Stats.patch rename to patches/server/0936-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/0938-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0937-Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/0938-Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/0937-Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/0939-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0938-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/server/0939-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/0938-Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/server/0940-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0939-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/0940-Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/0939-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/0941-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/0940-Remove-Spigot-Bug-Fix-for-MC-109346.patch similarity index 100% rename from patches/server/0941-Remove-Spigot-Bug-Fix-for-MC-109346.patch rename to patches/server/0940-Remove-Spigot-Bug-Fix-for-MC-109346.patch diff --git a/patches/server/0942-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0941-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/server/0942-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/server/0941-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/server/0943-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0942-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/server/0943-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/server/0942-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/server/0944-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0943-Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 100% rename from patches/server/0944-Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/server/0943-Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/server/0945-Fix-missing-map-initialize-event-call.patch b/patches/server/0944-Fix-missing-map-initialize-event-call.patch similarity index 100% rename from patches/server/0945-Fix-missing-map-initialize-event-call.patch rename to patches/server/0944-Fix-missing-map-initialize-event-call.patch diff --git a/patches/server/0946-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0945-Update-entity-data-when-attaching-firework-to-entity.patch similarity index 100% rename from patches/server/0946-Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/server/0945-Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/server/0947-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/0946-Use-correct-variable-for-initializing-CraftLootTable.patch similarity index 100% rename from patches/server/0947-Use-correct-variable-for-initializing-CraftLootTable.patch rename to patches/server/0946-Use-correct-variable-for-initializing-CraftLootTable.patch diff --git a/patches/server/0948-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0947-Fix-UnsafeValues-loadAdvancement.patch similarity index 100% rename from patches/server/0948-Fix-UnsafeValues-loadAdvancement.patch rename to patches/server/0947-Fix-UnsafeValues-loadAdvancement.patch diff --git a/patches/server/0949-Add-player-idle-duration-API.patch b/patches/server/0948-Add-player-idle-duration-API.patch similarity index 100% rename from patches/server/0949-Add-player-idle-duration-API.patch rename to patches/server/0948-Add-player-idle-duration-API.patch diff --git a/patches/server/0950-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0949-Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 100% rename from patches/server/0950-Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/server/0949-Don-t-check-if-we-can-see-non-visible-entities.patch diff --git a/patches/server/0951-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0950-Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/0951-Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/server/0950-Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/0952-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0951-Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 100% rename from patches/server/0952-Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/server/0951-Allow-null-itemstack-for-Player-sendEquipmentChange.patch diff --git a/patches/server/0953-Optimize-VarInts.patch b/patches/server/0952-Optimize-VarInts.patch similarity index 100% rename from patches/server/0953-Optimize-VarInts.patch rename to patches/server/0952-Optimize-VarInts.patch diff --git a/patches/server/0954-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0953-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/server/0954-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/server/0953-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/server/0955-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0954-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/server/0955-Add-predicate-for-blocks-when-raytracing.patch rename to patches/server/0954-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/server/0956-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0955-Broadcast-take-item-packets-with-collector-as-source.patch similarity index 100% rename from patches/server/0956-Broadcast-take-item-packets-with-collector-as-source.patch rename to patches/server/0955-Broadcast-take-item-packets-with-collector-as-source.patch diff --git a/patches/server/0957-Expand-LingeringPotion-API.patch b/patches/server/0956-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/server/0957-Expand-LingeringPotion-API.patch rename to patches/server/0956-Expand-LingeringPotion-API.patch diff --git a/patches/server/0958-Add-MaterialTagsTest.patch b/patches/server/0957-Add-MaterialTagsTest.patch similarity index 100% rename from patches/server/0958-Add-MaterialTagsTest.patch rename to patches/server/0957-Add-MaterialTagsTest.patch diff --git a/patches/server/0959-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0958-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/server/0959-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/server/0958-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/server/0960-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0959-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/server/0960-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/server/0959-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/server/0961-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0960-Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/server/0961-Fix-several-issues-with-EntityBreedEvent.patch rename to patches/server/0960-Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/server/0962-Add-UUID-attribute-modifier-API.patch b/patches/server/0961-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/server/0962-Add-UUID-attribute-modifier-API.patch rename to patches/server/0961-Add-UUID-attribute-modifier-API.patch diff --git a/patches/server/0963-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0962-Fix-missing-event-call-for-entity-teleport-API.patch similarity index 93% rename from patches/server/0963-Fix-missing-event-call-for-entity-teleport-API.patch rename to patches/server/0962-Fix-missing-event-call-for-entity-teleport-API.patch index 1d122c2f15..7da83443f1 100644 --- a/patches/server/0963-Fix-missing-event-call-for-entity-teleport-API.patch +++ b/patches/server/0962-Fix-missing-event-call-for-entity-teleport-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix missing event call for entity teleport API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 089eb25d532990773161063658f123f1e5bef2b3..9f657dc4075ce01c3a8f871c4a60e5ca5d8eb535 100644 +index a81c8a9d76c1d9fdee19132a9a40ffc2ab4d107e..38c14e06bcada9678b64c6eacf351de10232ee56 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -256,6 +256,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0964-Lazily-create-LootContext-for-criterions.patch b/patches/server/0963-Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/server/0964-Lazily-create-LootContext-for-criterions.patch rename to patches/server/0963-Lazily-create-LootContext-for-criterions.patch diff --git a/patches/server/0965-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0964-Don-t-fire-sync-events-during-worldgen.patch similarity index 99% rename from patches/server/0965-Don-t-fire-sync-events-during-worldgen.patch rename to patches/server/0964-Don-t-fire-sync-events-during-worldgen.patch index 2654c1f60d..58ccbc1f04 100644 --- a/patches/server/0965-Don-t-fire-sync-events-during-worldgen.patch +++ b/patches/server/0964-Don-t-fire-sync-events-during-worldgen.patch @@ -31,7 +31,7 @@ index 8235dace0f4a1090dfbd403db34231ccafe5f30e..9816913ad729fd39c173364b92e5db06 if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on {}", entity, new Throwable()); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 919c9ff3dd97d4bd2d41631176f9671f1987ad91..1de77621f159608f572ab4935ceb78863bb82c59 100644 +index 4db254f76bc2fb9867441016b3ac4f45f19d3bea..4125802dda07d79dd0e1f7e7dc3c0ee85fa0383c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -637,7 +637,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0966-Add-Structure-check-API.patch b/patches/server/0965-Add-Structure-check-API.patch similarity index 100% rename from patches/server/0966-Add-Structure-check-API.patch rename to patches/server/0965-Add-Structure-check-API.patch diff --git a/patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0966-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 100% rename from patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/server/0966-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch diff --git a/patches/server/0968-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0967-Restore-vanilla-entity-drops-behavior.patch similarity index 99% rename from patches/server/0968-Restore-vanilla-entity-drops-behavior.patch rename to patches/server/0967-Restore-vanilla-entity-drops-behavior.patch index e6db1df680..a82abb4271 100644 --- a/patches/server/0968-Restore-vanilla-entity-drops-behavior.patch +++ b/patches/server/0967-Restore-vanilla-entity-drops-behavior.patch @@ -50,7 +50,7 @@ index 7272dc058c575efee5ac2643ce41b7d12e346e89..ae5a2136a0e266d4c35190f5d3355299 if (entityitem == null) { return null; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1de77621f159608f572ab4935ceb78863bb82c59..5ab9ca815cb324c47c3e25a4d84a1b432bb393be 100644 +index 4125802dda07d79dd0e1f7e7dc3c0ee85fa0383c..7c99742e01e894bcc7d89a8588b2f128cf9b765d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2496,6 +2496,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0969-Dont-resend-blocks-on-interactions.patch b/patches/server/0968-Dont-resend-blocks-on-interactions.patch similarity index 100% rename from patches/server/0969-Dont-resend-blocks-on-interactions.patch rename to patches/server/0968-Dont-resend-blocks-on-interactions.patch diff --git a/patches/server/0970-add-more-scoreboard-API.patch b/patches/server/0969-add-more-scoreboard-API.patch similarity index 100% rename from patches/server/0970-add-more-scoreboard-API.patch rename to patches/server/0969-add-more-scoreboard-API.patch diff --git a/patches/server/0971-Improve-Registry.patch b/patches/server/0970-Improve-Registry.patch similarity index 100% rename from patches/server/0971-Improve-Registry.patch rename to patches/server/0970-Improve-Registry.patch diff --git a/patches/server/0972-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0971-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch similarity index 100% rename from patches/server/0972-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch rename to patches/server/0971-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch diff --git a/patches/server/0973-Add-experience-points-API.patch b/patches/server/0972-Add-experience-points-API.patch similarity index 100% rename from patches/server/0973-Add-experience-points-API.patch rename to patches/server/0972-Add-experience-points-API.patch diff --git a/patches/server/0974-Add-drops-to-shear-events.patch b/patches/server/0973-Add-drops-to-shear-events.patch similarity index 100% rename from patches/server/0974-Add-drops-to-shear-events.patch rename to patches/server/0973-Add-drops-to-shear-events.patch diff --git a/patches/server/0975-Add-PlayerShieldDisableEvent.patch b/patches/server/0974-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/server/0975-Add-PlayerShieldDisableEvent.patch rename to patches/server/0974-Add-PlayerShieldDisableEvent.patch diff --git a/patches/server/0976-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0975-Validate-ResourceLocation-in-NBT-reading.patch similarity index 100% rename from patches/server/0976-Validate-ResourceLocation-in-NBT-reading.patch rename to patches/server/0975-Validate-ResourceLocation-in-NBT-reading.patch diff --git a/patches/server/0977-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0976-Properly-handle-experience-dropping-on-block-break.patch similarity index 100% rename from patches/server/0977-Properly-handle-experience-dropping-on-block-break.patch rename to patches/server/0976-Properly-handle-experience-dropping-on-block-break.patch diff --git a/patches/server/0978-Fixup-NamespacedKey-handling.patch b/patches/server/0977-Fixup-NamespacedKey-handling.patch similarity index 100% rename from patches/server/0978-Fixup-NamespacedKey-handling.patch rename to patches/server/0977-Fixup-NamespacedKey-handling.patch diff --git a/patches/server/0979-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0978-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/server/0979-Expose-LootTable-of-DecoratedPot.patch rename to patches/server/0978-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/server/0980-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0979-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0980-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0979-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0981-Rewrite-dataconverter-system.patch b/patches/server/0980-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0981-Rewrite-dataconverter-system.patch rename to patches/server/0980-Rewrite-dataconverter-system.patch diff --git a/patches/server/0982-Starlight.patch b/patches/server/0981-Starlight.patch similarity index 100% rename from patches/server/0982-Starlight.patch rename to patches/server/0981-Starlight.patch diff --git a/patches/server/0983-Rewrite-chunk-system.patch b/patches/server/0982-Rewrite-chunk-system.patch similarity index 99% rename from patches/server/0983-Rewrite-chunk-system.patch rename to patches/server/0982-Rewrite-chunk-system.patch index 2a35933def..12bc4a8ec8 100644 --- a/patches/server/0983-Rewrite-chunk-system.patch +++ b/patches/server/0982-Rewrite-chunk-system.patch @@ -19375,7 +19375,7 @@ index 640db9f71608310a64e09f1e3e677c01e6ccd98a..f2a7cb6ebed7a4b4019a09af2a025f62 if (flag1) { ++this.converted; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5ab9ca815cb324c47c3e25a4d84a1b432bb393be..42d01cec6eba11183409c9a93d068e61f5010153 100644 +index 7c99742e01e894bcc7d89a8588b2f128cf9b765d..3f620c4b8415f09a8d4664481b2d41d421ee836e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -480,6 +480,58 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0984-incremental-chunk-and-player-saving.patch b/patches/server/0983-incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/0984-incremental-chunk-and-player-saving.patch rename to patches/server/0983-incremental-chunk-and-player-saving.patch diff --git a/patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0990-Fix-World-isChunkGenerated-calls.patch b/patches/server/0989-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0990-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0989-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0991-Flat-bedrock-generator-settings.patch b/patches/server/0990-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0991-Flat-bedrock-generator-settings.patch rename to patches/server/0990-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0992-Entity-Activation-Range-2.0.patch b/patches/server/0991-Entity-Activation-Range-2.0.patch similarity index 99% rename from patches/server/0992-Entity-Activation-Range-2.0.patch rename to patches/server/0991-Entity-Activation-Range-2.0.patch index 4bec5ca13e..fd890e7432 100644 --- a/patches/server/0992-Entity-Activation-Range-2.0.patch +++ b/patches/server/0991-Entity-Activation-Range-2.0.patch @@ -111,7 +111,7 @@ index bd8c96e914b156284bdbb960f168e63e1f122920..abb4c32e8b35de332fa517523e8c598e } 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 42d01cec6eba11183409c9a93d068e61f5010153..1f892783c16ab8fd863832255a2b03df381aa84e 100644 +index 3f620c4b8415f09a8d4664481b2d41d421ee836e..703b32362cf6a23dfe9326aa4e0ee74511e0d2cb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -412,6 +412,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0993-Optional-per-player-mob-spawns.patch b/patches/server/0992-Optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0993-Optional-per-player-mob-spawns.patch rename to patches/server/0992-Optional-per-player-mob-spawns.patch diff --git a/patches/server/0994-Anti-Xray.patch b/patches/server/0993-Anti-Xray.patch similarity index 100% rename from patches/server/0994-Anti-Xray.patch rename to patches/server/0993-Anti-Xray.patch diff --git a/patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 100% rename from patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch diff --git a/patches/server/0996-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0995-Optimize-Collision-to-not-load-chunks.patch similarity index 98% rename from patches/server/0996-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0995-Optimize-Collision-to-not-load-chunks.patch index 2ad06277cb..b992c3fadf 100644 --- a/patches/server/0996-Optimize-Collision-to-not-load-chunks.patch +++ b/patches/server/0995-Optimize-Collision-to-not-load-chunks.patch @@ -26,7 +26,7 @@ index 461c27292af06a5150de8ec263d0c8527e8c5278..37245ff682837e7e8c9647f4afe30f0d // CraftBukkit end 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 1f892783c16ab8fd863832255a2b03df381aa84e..720d08400915da9270ee4abf84bcb73f354ae2b4 100644 +index 703b32362cf6a23dfe9326aa4e0ee74511e0d2cb..8531304667a85436fd557d319fe36a37b3661ae5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -242,6 +242,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0997-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0996-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0997-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0996-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0998-Entity-load-save-limit-per-chunk.patch b/patches/server/0997-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0998-Entity-load-save-limit-per-chunk.patch rename to patches/server/0997-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0999-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0998-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0999-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0998-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/1000-Improved-Watchdog-Support.patch b/patches/server/0999-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/1000-Improved-Watchdog-Support.patch rename to patches/server/0999-Improved-Watchdog-Support.patch diff --git a/patches/server/1001-Optimize-Voxel-Shape-Merging.patch b/patches/server/1000-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/1001-Optimize-Voxel-Shape-Merging.patch rename to patches/server/1000-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/1002-Write-SavedData-IO-async.patch b/patches/server/1001-Write-SavedData-IO-async.patch similarity index 100% rename from patches/server/1002-Write-SavedData-IO-async.patch rename to patches/server/1001-Write-SavedData-IO-async.patch diff --git a/patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/1002-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/1002-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1003-Use-distance-map-to-optimise-entity-tracker.patch similarity index 99% rename from patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/1003-Use-distance-map-to-optimise-entity-tracker.patch index be6acff7e6..986378b88f 100644 --- a/patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch +++ b/patches/server/1003-Use-distance-map-to-optimise-entity-tracker.patch @@ -236,7 +236,7 @@ index ac1a4ff5f83e53fa2983ff6e834775e51fba715e..284f9548d62f9230c668bb1adb8cb808 return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false; } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 720d08400915da9270ee4abf84bcb73f354ae2b4..28ca0aae8f8c755b558a03fc9283fa1a44697e1a 100644 +index 8531304667a85436fd557d319fe36a37b3661ae5..f220e9ba35b07b690df93b1d733e9c666c772de9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -56,6 +56,7 @@ import net.minecraft.network.syncher.EntityDataSerializers; diff --git a/patches/server/1005-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1004-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/1005-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/1004-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/1006-Remove-streams-from-hot-code.patch b/patches/server/1005-Remove-streams-from-hot-code.patch similarity index 100% rename from patches/server/1006-Remove-streams-from-hot-code.patch rename to patches/server/1005-Remove-streams-from-hot-code.patch diff --git a/patches/server/1007-Eigencraft-redstone-implementation.patch b/patches/server/1006-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/1007-Eigencraft-redstone-implementation.patch rename to patches/server/1006-Eigencraft-redstone-implementation.patch diff --git a/patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1007-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/1007-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/1009-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/1008-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/1009-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/1008-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/1010-Improve-boat-collision-performance.patch b/patches/server/1009-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/1010-Improve-boat-collision-performance.patch rename to patches/server/1009-Improve-boat-collision-performance.patch diff --git a/patches/server/1011-Optimise-general-POI-access.patch b/patches/server/1010-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/1011-Optimise-general-POI-access.patch rename to patches/server/1010-Optimise-general-POI-access.patch diff --git a/patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1011-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/1011-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/1013-Execute-chunk-tasks-mid-tick.patch b/patches/server/1012-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/1013-Execute-chunk-tasks-mid-tick.patch rename to patches/server/1012-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/1014-Optimise-random-block-ticking.patch b/patches/server/1013-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/1014-Optimise-random-block-ticking.patch rename to patches/server/1013-Optimise-random-block-ticking.patch diff --git a/patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1014-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/1014-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1015-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/1015-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/1017-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1016-Detail-more-information-in-watchdog-dumps.patch similarity index 99% rename from patches/server/1017-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/1016-Detail-more-information-in-watchdog-dumps.patch index 710f25f69b..bf520606cb 100644 --- a/patches/server/1017-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/1016-Detail-more-information-in-watchdog-dumps.patch @@ -122,7 +122,7 @@ index 9d18da228c6709e7665ba8babb6ee6d0b36b5dc5..af9f58328c09dddb2875f79128f906b8 private void tickPassenger(Entity vehicle, Entity passenger) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 28ca0aae8f8c755b558a03fc9283fa1a44697e1a..ec01a97cac653fb1a2065289fe5b0c6824732bcb 100644 +index f220e9ba35b07b690df93b1d733e9c666c772de9..c1a8de736ee39e4e177399bc51aedfd135a8100d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1063,8 +1063,43 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/1018-Collision-optimisations.patch b/patches/server/1017-Collision-optimisations.patch similarity index 99% rename from patches/server/1018-Collision-optimisations.patch rename to patches/server/1017-Collision-optimisations.patch index c57de0cfdf..de992f75ee 100644 --- a/patches/server/1018-Collision-optimisations.patch +++ b/patches/server/1017-Collision-optimisations.patch @@ -2214,7 +2214,7 @@ index 594cb6ce4bfa6c42212000a1ed983ea95ee2c4bf..97b0119ac71284b3a223c089bec26d87 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 ec01a97cac653fb1a2065289fe5b0c6824732bcb..be2220457e941803b14d78c550d0db777c79a886 100644 +index c1a8de736ee39e4e177399bc51aedfd135a8100d..6de971aca46caad091271d125a079a1b7a5f163d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1250,9 +1250,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1018-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/1018-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch similarity index 100% rename from patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch rename to patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch diff --git a/patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1020-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/1020-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/1022-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1021-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/1022-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/1021-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/1023-optimize-dirt-and-snow-spreading.patch b/patches/server/1022-optimize-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/1023-optimize-dirt-and-snow-spreading.patch rename to patches/server/1022-optimize-dirt-and-snow-spreading.patch diff --git a/patches/server/1024-Properly-resend-entities.patch b/patches/server/1023-Properly-resend-entities.patch similarity index 99% rename from patches/server/1024-Properly-resend-entities.patch rename to patches/server/1023-Properly-resend-entities.patch index a00f094df7..f0d407671b 100644 --- a/patches/server/1024-Properly-resend-entities.patch +++ b/patches/server/1023-Properly-resend-entities.patch @@ -180,7 +180,7 @@ index a1bfd700cd4c39e4bb1b9c140b54b7c82cd8b32c..205b52e486123aa23a1469de896ab1ec } entity.playSound(((Bucketable) entity).getPickupSound(), 1.0F, 1.0F); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 9f657dc4075ce01c3a8f871c4a60e5ca5d8eb535..0b5a31477e3b76833fb97a455842316193663c8e 100644 +index 38c14e06bcada9678b64c6eacf351de10232ee56..7cd7912cecbbbe2c32bfd9b85181115c6d316eb8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1000,7 +1000,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/1025-Optimize-Hoppers.patch b/patches/server/1024-Optimize-Hoppers.patch similarity index 100% rename from patches/server/1025-Optimize-Hoppers.patch rename to patches/server/1024-Optimize-Hoppers.patch diff --git a/patches/server/1026-Improve-performance-of-mass-crafts.patch b/patches/server/1025-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1026-Improve-performance-of-mass-crafts.patch rename to patches/server/1025-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1027-Actually-optimise-explosions.patch b/patches/server/1026-Actually-optimise-explosions.patch similarity index 100% rename from patches/server/1027-Actually-optimise-explosions.patch rename to patches/server/1026-Actually-optimise-explosions.patch diff --git a/patches/server/1028-Optimise-chunk-tick-iteration.patch b/patches/server/1027-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/1028-Optimise-chunk-tick-iteration.patch rename to patches/server/1027-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/1029-Lag-compensation-ticks.patch b/patches/server/1028-Lag-compensation-ticks.patch similarity index 100% rename from patches/server/1029-Lag-compensation-ticks.patch rename to patches/server/1028-Lag-compensation-ticks.patch diff --git a/patches/server/1030-Optimise-nearby-player-retrieval.patch b/patches/server/1029-Optimise-nearby-player-retrieval.patch similarity index 100% rename from patches/server/1030-Optimise-nearby-player-retrieval.patch rename to patches/server/1029-Optimise-nearby-player-retrieval.patch diff --git a/patches/server/1031-Distance-manager-tick-timings.patch b/patches/server/1030-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/1031-Distance-manager-tick-timings.patch rename to patches/server/1030-Distance-manager-tick-timings.patch diff --git a/patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1031-Handle-Oversized-block-entities-in-chunks.patch similarity index 100% rename from patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch rename to patches/server/1031-Handle-Oversized-block-entities-in-chunks.patch diff --git a/patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1032-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/1032-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/1034-Add-ShulkerDuplicateEvent.patch b/patches/server/1033-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/server/1034-Add-ShulkerDuplicateEvent.patch rename to patches/server/1033-Add-ShulkerDuplicateEvent.patch diff --git a/patches/server/1035-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/1034-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/server/1035-Add-api-for-spawn-egg-texture-colors.patch rename to patches/server/1034-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/server/1036-Disable-memory-reserve-allocating.patch b/patches/server/1035-Disable-memory-reserve-allocating.patch similarity index 100% rename from patches/server/1036-Disable-memory-reserve-allocating.patch rename to patches/server/1035-Disable-memory-reserve-allocating.patch diff --git a/patches/server/1037-Improve-tag-parser-handling.patch b/patches/server/1036-Improve-tag-parser-handling.patch similarity index 100% rename from patches/server/1037-Improve-tag-parser-handling.patch rename to patches/server/1036-Improve-tag-parser-handling.patch diff --git a/patches/server/1038-Add-Lifecycle-Event-system.patch b/patches/server/1037-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/server/1038-Add-Lifecycle-Event-system.patch rename to patches/server/1037-Add-Lifecycle-Event-system.patch diff --git a/patches/server/1039-Conduit-API.patch b/patches/server/1038-Conduit-API.patch similarity index 100% rename from patches/server/1039-Conduit-API.patch rename to patches/server/1038-Conduit-API.patch diff --git a/patches/server/1040-ItemStack-Tooltip-API.patch b/patches/server/1039-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/server/1040-ItemStack-Tooltip-API.patch rename to patches/server/1039-ItemStack-Tooltip-API.patch diff --git a/patches/server/1041-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/1040-Fix-possible-StackOverflowError-for-some-dispenses.patch similarity index 100% rename from patches/server/1041-Fix-possible-StackOverflowError-for-some-dispenses.patch rename to patches/server/1040-Fix-possible-StackOverflowError-for-some-dispenses.patch diff --git a/patches/server/1042-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/1041-Properly-track-the-changed-item-from-dispense-events.patch similarity index 100% rename from patches/server/1042-Properly-track-the-changed-item-from-dispense-events.patch rename to patches/server/1041-Properly-track-the-changed-item-from-dispense-events.patch diff --git a/patches/server/1043-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/1042-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/server/1043-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/server/1042-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/server/1044-Add-FluidState-API.patch b/patches/server/1043-Add-FluidState-API.patch similarity index 100% rename from patches/server/1044-Add-FluidState-API.patch rename to patches/server/1043-Add-FluidState-API.patch diff --git a/patches/server/1045-add-number-format-api.patch b/patches/server/1044-add-number-format-api.patch similarity index 100% rename from patches/server/1045-add-number-format-api.patch rename to patches/server/1044-add-number-format-api.patch diff --git a/patches/server/1046-check-if-itemstack-is-stackable-first.patch b/patches/server/1045-check-if-itemstack-is-stackable-first.patch similarity index 100% rename from patches/server/1046-check-if-itemstack-is-stackable-first.patch rename to patches/server/1045-check-if-itemstack-is-stackable-first.patch diff --git a/patches/server/1047-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/1046-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch similarity index 100% rename from patches/server/1047-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch rename to patches/server/1046-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch diff --git a/patches/server/1048-improve-BanList-types.patch b/patches/server/1047-improve-BanList-types.patch similarity index 100% rename from patches/server/1048-improve-BanList-types.patch rename to patches/server/1047-improve-BanList-types.patch diff --git a/patches/server/1049-Configurable-max-block-fluid-ticks.patch b/patches/server/1048-Configurable-max-block-fluid-ticks.patch similarity index 100% rename from patches/server/1049-Configurable-max-block-fluid-ticks.patch rename to patches/server/1048-Configurable-max-block-fluid-ticks.patch diff --git a/patches/server/1050-disable-forced-empty-world-ticks.patch b/patches/server/1049-disable-forced-empty-world-ticks.patch similarity index 100% rename from patches/server/1050-disable-forced-empty-world-ticks.patch rename to patches/server/1049-disable-forced-empty-world-ticks.patch diff --git a/patches/server/1051-Suspicious-Effect-Entry-API.patch b/patches/server/1050-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/server/1051-Suspicious-Effect-Entry-API.patch rename to patches/server/1050-Suspicious-Effect-Entry-API.patch diff --git a/patches/server/1052-Per-world-ticks-per-spawn-settings.patch b/patches/server/1051-Per-world-ticks-per-spawn-settings.patch similarity index 100% rename from patches/server/1052-Per-world-ticks-per-spawn-settings.patch rename to patches/server/1051-Per-world-ticks-per-spawn-settings.patch diff --git a/patches/server/1053-Add-onboarding-message-for-initial-server-start.patch b/patches/server/1052-Add-onboarding-message-for-initial-server-start.patch similarity index 100% rename from patches/server/1053-Add-onboarding-message-for-initial-server-start.patch rename to patches/server/1052-Add-onboarding-message-for-initial-server-start.patch diff --git a/patches/server/1054-Fix-DamageSource-API.patch b/patches/server/1053-Fix-DamageSource-API.patch similarity index 99% rename from patches/server/1054-Fix-DamageSource-API.patch rename to patches/server/1053-Fix-DamageSource-API.patch index 3c80fe5209..b775177307 100644 --- a/patches/server/1054-Fix-DamageSource-API.patch +++ b/patches/server/1053-Fix-DamageSource-API.patch @@ -44,7 +44,7 @@ index 1561b85a45f52a8162f43553f8485bfe084b8f1f..b26e4d58ea1898a5e4b31c3d6ab33f38 } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index be2220457e941803b14d78c550d0db777c79a886..f5a86c0fb1a7a313afc4c56ffc445a7fe7821428 100644 +index 6de971aca46caad091271d125a079a1b7a5f163d..b2eff51f1ad1e702525ef298807ea7d2083f6218 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3462,7 +3462,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/1055-Expanded-Hopper-API.patch b/patches/server/1054-Expanded-Hopper-API.patch similarity index 100% rename from patches/server/1055-Expanded-Hopper-API.patch rename to patches/server/1054-Expanded-Hopper-API.patch