diff --git a/patches/api/0053-Fix-upstream-javadocs.patch b/patches/api/0053-Fix-upstream-javadocs.patch index dc20117029..d186537a3c 100644 --- a/patches/api/0053-Fix-upstream-javadocs.patch +++ b/patches/api/0053-Fix-upstream-javadocs.patch @@ -1719,6 +1719,32 @@ index b84b37fe27d84574dc5897285f1d9a1437bd322c..281ae60a6be7e39aab4f27b4c7de3d49 * * @return Set containing all the channels that this client may accept. */ +diff --git a/src/main/java/org/bukkit/projectiles/ProjectileSource.java b/src/main/java/org/bukkit/projectiles/ProjectileSource.java +index eabd8b926ec1c934cd7e77b7cc6adfae16771021..8557bfefaf02538dec95adb29734ae2cf50f3f8c 100644 +--- a/src/main/java/org/bukkit/projectiles/ProjectileSource.java ++++ b/src/main/java/org/bukkit/projectiles/ProjectileSource.java +@@ -12,6 +12,10 @@ public interface ProjectileSource { + + /** + * Launches a {@link Projectile} from the ProjectileSource. ++ *

++ * The family of launchProjectile methods only promise the ability to launch projectile types ++ * that the {@link ProjectileSource} is capable of firing in vanilla. ++ * Any other types of projectiles *may* be implemented but are not part of the method contract. + * + * @param a projectile subclass + * @param projectile class of the projectile to launch +@@ -23,6 +27,10 @@ public interface ProjectileSource { + /** + * Launches a {@link Projectile} from the ProjectileSource with an + * initial velocity. ++ *

++ * The family of launchProjectile methods only promise the ability to launch projectile types ++ * that the {@link ProjectileSource} is capable of firing in vanilla. ++ * Any other types of projectiles *may* be implemented but are not part of the method contract. + * + * @param a projectile subclass + * @param projectile class of the projectile to launch diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java index 22b1dc5fd4d453161a5ee520072f8e8f955b3a80..a625bcab8e77b05b3341a52c708fae1542b7e3d5 100644 --- a/src/main/java/org/bukkit/scoreboard/Objective.java diff --git a/patches/api/0338-More-Projectile-API.patch b/patches/api/0338-More-Projectile-API.patch index ddb5200413..b94c7cf17a 100644 --- a/patches/api/0338-More-Projectile-API.patch +++ b/patches/api/0338-More-Projectile-API.patch @@ -5,6 +5,7 @@ Subject: [PATCH] More Projectile API Co-authored-by: Nassim Jahnke Co-authored-by: SoSeDiK +Co-authored-by: MelnCat diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java index 8bf9bf7940d2911486e9d3a4f688cfae3f6173f2..9bf4b86e730f3d066f6ebfd4e516caf78145479e 100644 @@ -486,3 +487,34 @@ index c8015ff610e3c1222cb368ea1d8a0c2f3785d9c7..02584eced96944a551140f8150c65a7c + void setHasDealtDamage(boolean hasDealtDamage); } // Paper end +diff --git a/src/main/java/org/bukkit/projectiles/ProjectileSource.java b/src/main/java/org/bukkit/projectiles/ProjectileSource.java +index 8557bfefaf02538dec95adb29734ae2cf50f3f8c..03faf9a142f494e255258099a6b8831a0d4a879b 100644 +--- a/src/main/java/org/bukkit/projectiles/ProjectileSource.java ++++ b/src/main/java/org/bukkit/projectiles/ProjectileSource.java +@@ -39,4 +39,26 @@ public interface ProjectileSource { + */ + @NotNull + public T launchProjectile(@NotNull Class projectile, @Nullable Vector velocity); ++ ++ // Paper start - add consumer to launchProjectile ++ /** ++ * Launches a {@link Projectile} from the ProjectileSource with an ++ * initial velocity, with the supplied function run before the ++ * entity is added to the world. ++ *
++ * Note that when the function is run, the entity will not be actually in ++ * the world. Any operation involving such as teleporting the entity is undefined ++ * until after this function returns. ++ *

++ * The family of launchProjectile methods only promise the ability to launch projectile types ++ * that the {@link ProjectileSource} is capable of firing in vanilla. ++ * Any other types of projectiles *may* be implemented but are not part of the method contract. ++ * @param a projectile subclass ++ * @param projectile class of the projectile to launch ++ * @param velocity the velocity with which to launch ++ * @param function the function to be run before the entity is spawned ++ * @return the launched projectile ++ */ ++ @NotNull T launchProjectile(@NotNull Class projectile, @Nullable Vector velocity, java.util.function.@Nullable Consumer function); ++ // Paper end - add consumer to launchProjectile + } diff --git a/patches/api/0361-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0361-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch deleted file mode 100644 index 291761dadb..0000000000 --- a/patches/api/0361-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MelnCat -Date: Mon, 19 Sep 2022 14:04:13 -0700 -Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile - - -diff --git a/src/main/java/org/bukkit/projectiles/ProjectileSource.java b/src/main/java/org/bukkit/projectiles/ProjectileSource.java -index eabd8b926ec1c934cd7e77b7cc6adfae16771021..96ebd30d339060758e726e9e1e7428d1d0813c17 100644 ---- a/src/main/java/org/bukkit/projectiles/ProjectileSource.java -+++ b/src/main/java/org/bukkit/projectiles/ProjectileSource.java -@@ -31,4 +31,23 @@ public interface ProjectileSource { - */ - @NotNull - public T launchProjectile(@NotNull Class projectile, @Nullable Vector velocity); -+ -+ // Paper start - add consumer to launchProjectile -+ /** -+ * Launches a {@link Projectile} from the ProjectileSource with an -+ * initial velocity, with the supplied function run before the -+ * entity is added to the world. -+ *
-+ * Note that when the function is run, the entity will not be actually in -+ * the world. Any operation involving such as teleporting the entity is undefined -+ * until after this function returns. -+ * -+ * @param a projectile subclass -+ * @param projectile class of the projectile to launch -+ * @param velocity the velocity with which to launch -+ * @param function the function to be run before the entity is spawned -+ * @return the launched projectile -+ */ -+ @NotNull T launchProjectile(@NotNull Class projectile, @Nullable Vector velocity, java.util.function.@Nullable Consumer function); -+ // Paper end - add consumer to launchProjectile - } diff --git a/patches/api/0362-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0361-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch similarity index 100% rename from patches/api/0362-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch rename to patches/api/0361-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch diff --git a/patches/api/0363-Add-getDrops-to-BlockState.patch b/patches/api/0362-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/api/0363-Add-getDrops-to-BlockState.patch rename to patches/api/0362-Add-getDrops-to-BlockState.patch diff --git a/patches/api/0364-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0363-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/api/0364-Add-PlayerInventorySlotChangeEvent.patch rename to patches/api/0363-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/api/0365-Elder-Guardian-appearance-API.patch b/patches/api/0364-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/api/0365-Elder-Guardian-appearance-API.patch rename to patches/api/0364-Elder-Guardian-appearance-API.patch diff --git a/patches/api/0366-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0365-Add-EquipmentSlot-convenience-methods.patch similarity index 100% rename from patches/api/0366-Add-EquipmentSlot-convenience-methods.patch rename to patches/api/0365-Add-EquipmentSlot-convenience-methods.patch diff --git a/patches/api/0367-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0366-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch similarity index 100% rename from patches/api/0367-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch rename to patches/api/0366-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch diff --git a/patches/api/0368-Add-entity-knockback-API.patch b/patches/api/0367-Add-entity-knockback-API.patch similarity index 100% rename from patches/api/0368-Add-entity-knockback-API.patch rename to patches/api/0367-Add-entity-knockback-API.patch diff --git a/patches/api/0369-Added-EntityToggleSitEvent.patch b/patches/api/0368-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/api/0369-Added-EntityToggleSitEvent.patch rename to patches/api/0368-Added-EntityToggleSitEvent.patch diff --git a/patches/api/0370-Add-Moving-Piston-API.patch b/patches/api/0369-Add-Moving-Piston-API.patch similarity index 100% rename from patches/api/0370-Add-Moving-Piston-API.patch rename to patches/api/0369-Add-Moving-Piston-API.patch diff --git a/patches/api/0371-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0370-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/api/0371-Add-PrePlayerAttackEntityEvent.patch rename to patches/api/0370-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/api/0372-Add-Player-Warden-Warning-API.patch b/patches/api/0371-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/api/0372-Add-Player-Warden-Warning-API.patch rename to patches/api/0371-Add-Player-Warden-Warning-API.patch diff --git a/patches/api/0373-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0372-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/api/0373-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/api/0372-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/api/0374-Add-paper-dumplisteners-command.patch b/patches/api/0373-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/api/0374-Add-paper-dumplisteners-command.patch rename to patches/api/0373-Add-paper-dumplisteners-command.patch diff --git a/patches/api/0375-ItemStack-damage-API.patch b/patches/api/0374-ItemStack-damage-API.patch similarity index 100% rename from patches/api/0375-ItemStack-damage-API.patch rename to patches/api/0374-ItemStack-damage-API.patch diff --git a/patches/api/0376-Add-Tick-TemporalUnit.patch b/patches/api/0375-Add-Tick-TemporalUnit.patch similarity index 100% rename from patches/api/0376-Add-Tick-TemporalUnit.patch rename to patches/api/0375-Add-Tick-TemporalUnit.patch diff --git a/patches/api/0377-Friction-API.patch b/patches/api/0376-Friction-API.patch similarity index 96% rename from patches/api/0377-Friction-API.patch rename to patches/api/0376-Friction-API.patch index 7667486715..01f4286418 100644 --- a/patches/api/0377-Friction-API.patch +++ b/patches/api/0376-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 c9c3b926c5bb408d964ed5acc9f95c8527837a25..7c027d7bbd6b8a1543fa92d44e99674925f093b3 100644 +index 9f3e2903c955f2a5d1b25825c49188df62d20cef..016529563381a674db8050cb328f9e8f16e72e93 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/0378-Player-Entity-Tracking-Events.patch b/patches/api/0377-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/api/0378-Player-Entity-Tracking-Events.patch rename to patches/api/0377-Player-Entity-Tracking-Events.patch diff --git a/patches/api/0379-Add-missing-Fluid-type.patch b/patches/api/0378-Add-missing-Fluid-type.patch similarity index 100% rename from patches/api/0379-Add-missing-Fluid-type.patch rename to patches/api/0378-Add-missing-Fluid-type.patch diff --git a/patches/api/0380-fix-Instruments.patch b/patches/api/0379-fix-Instruments.patch similarity index 100% rename from patches/api/0380-fix-Instruments.patch rename to patches/api/0379-fix-Instruments.patch diff --git a/patches/api/0381-Add-BlockLockCheckEvent.patch b/patches/api/0380-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/api/0381-Add-BlockLockCheckEvent.patch rename to patches/api/0380-Add-BlockLockCheckEvent.patch diff --git a/patches/api/0382-Add-Sneaking-API-for-Entities.patch b/patches/api/0381-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/api/0382-Add-Sneaking-API-for-Entities.patch rename to patches/api/0381-Add-Sneaking-API-for-Entities.patch diff --git a/patches/api/0383-Improve-PortalEvents.patch b/patches/api/0382-Improve-PortalEvents.patch similarity index 100% rename from patches/api/0383-Improve-PortalEvents.patch rename to patches/api/0382-Improve-PortalEvents.patch diff --git a/patches/api/0384-Flying-Fall-Damage-API.patch b/patches/api/0383-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/api/0384-Flying-Fall-Damage-API.patch rename to patches/api/0383-Flying-Fall-Damage-API.patch diff --git a/patches/api/0385-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0384-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch similarity index 100% rename from patches/api/0385-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch rename to patches/api/0384-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch diff --git a/patches/api/0386-Win-Screen-API.patch b/patches/api/0385-Win-Screen-API.patch similarity index 100% rename from patches/api/0386-Win-Screen-API.patch rename to patches/api/0385-Win-Screen-API.patch diff --git a/patches/api/0387-Add-Entity-Body-Yaw-API.patch b/patches/api/0386-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/api/0387-Add-Entity-Body-Yaw-API.patch rename to patches/api/0386-Add-Entity-Body-Yaw-API.patch diff --git a/patches/api/0388-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0387-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch similarity index 100% rename from patches/api/0388-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch rename to patches/api/0387-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch diff --git a/patches/api/0389-Add-EntityFertilizeEggEvent.patch b/patches/api/0388-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/api/0389-Add-EntityFertilizeEggEvent.patch rename to patches/api/0388-Add-EntityFertilizeEggEvent.patch diff --git a/patches/api/0390-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0389-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/api/0390-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/api/0389-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/api/0391-Add-Shearable-API.patch b/patches/api/0390-Add-Shearable-API.patch similarity index 100% rename from patches/api/0391-Add-Shearable-API.patch rename to patches/api/0390-Add-Shearable-API.patch diff --git a/patches/api/0392-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0391-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/api/0392-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/api/0391-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/api/0393-Add-Mob-Experience-reward-API.patch b/patches/api/0392-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/api/0393-Add-Mob-Experience-reward-API.patch rename to patches/api/0392-Add-Mob-Experience-reward-API.patch diff --git a/patches/api/0394-Expand-PlayerItemMendEvent.patch b/patches/api/0393-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/api/0394-Expand-PlayerItemMendEvent.patch rename to patches/api/0393-Expand-PlayerItemMendEvent.patch diff --git a/patches/api/0395-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0394-Add-method-to-remove-all-active-potion-effects.patch similarity index 91% rename from patches/api/0395-Add-method-to-remove-all-active-potion-effects.patch rename to patches/api/0394-Add-method-to-remove-all-active-potion-effects.patch index 4106e532d8..a9d228f158 100644 --- a/patches/api/0395-Add-method-to-remove-all-active-potion-effects.patch +++ b/patches/api/0394-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 f5149d54d6cb5019f398718b9aa52bc3ab34a5ae..ad3717d963f28751d410e6688ae64a4c1175871d 100644 +index c610731928ac9b01b111a7ccf0340ad59fcfb867..4aab0144601788a7902c9fdabb68744d9e33a345 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -657,6 +657,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0396-Folia-scheduler-and-owned-region-API.patch b/patches/api/0395-Folia-scheduler-and-owned-region-API.patch similarity index 99% rename from patches/api/0396-Folia-scheduler-and-owned-region-API.patch rename to patches/api/0395-Folia-scheduler-and-owned-region-API.patch index a9911d3665..b07676cfef 100644 --- a/patches/api/0396-Folia-scheduler-and-owned-region-API.patch +++ b/patches/api/0395-Folia-scheduler-and-owned-region-API.patch @@ -499,7 +499,7 @@ index 0000000000000000000000000000000000000000..a6b50c9d8af589cc4747e14d343d2045 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 556e8c6cf90af9c90ded18be013167fa440d6505..9265ee60edfb3df797e425e854c7d3c9c034a85c 100644 +index adc95cd1486791787950533ef8e4baaf5d3827cc..50efe16bb80c618c3dfae03b70c8c165183af8ec 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -2672,6 +2672,141 @@ public final class Bukkit { @@ -645,7 +645,7 @@ index 556e8c6cf90af9c90ded18be013167fa440d6505..9265ee60edfb3df797e425e854c7d3c9 public static Server.Spigot spigot() { return server.spigot(); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index a859d7bc870e5ef16793c2da453c84685b78ee47..968a5e18a023c92158a753f6d8fce4b2d0f0de48 100644 +index 0648130a6ce2e08d96b05fde1cfd58c2bb24ae07..1b8d6a3333a4fa9155b79644e683e2343c134e12 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -2333,4 +2333,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0397-Add-event-for-player-editing-sign.patch b/patches/api/0396-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/api/0397-Add-event-for-player-editing-sign.patch rename to patches/api/0396-Add-event-for-player-editing-sign.patch diff --git a/patches/api/0398-More-Sign-Block-API.patch b/patches/api/0397-More-Sign-Block-API.patch similarity index 100% rename from patches/api/0398-More-Sign-Block-API.patch rename to patches/api/0397-More-Sign-Block-API.patch diff --git a/patches/api/0399-Fix-BanList-API.patch b/patches/api/0398-Fix-BanList-API.patch similarity index 100% rename from patches/api/0399-Fix-BanList-API.patch rename to patches/api/0398-Fix-BanList-API.patch diff --git a/patches/api/0400-Add-whitelist-events.patch b/patches/api/0399-Add-whitelist-events.patch similarity index 100% rename from patches/api/0400-Add-whitelist-events.patch rename to patches/api/0399-Add-whitelist-events.patch diff --git a/patches/api/0401-API-for-updating-recipes-on-clients.patch b/patches/api/0400-API-for-updating-recipes-on-clients.patch similarity index 97% rename from patches/api/0401-API-for-updating-recipes-on-clients.patch rename to patches/api/0400-API-for-updating-recipes-on-clients.patch index 11b14673fa..4a98cf2e1e 100644 --- a/patches/api/0401-API-for-updating-recipes-on-clients.patch +++ b/patches/api/0400-API-for-updating-recipes-on-clients.patch @@ -5,7 +5,7 @@ Subject: [PATCH] API for updating recipes on clients diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 9265ee60edfb3df797e425e854c7d3c9c034a85c..f2753ef7d53ff3ff3531eaea89e816d7d8ce8b15 100644 +index 50efe16bb80c618c3dfae03b70c8c165183af8ec..52c601328bbf5c1642aa620c8bb466a9d2d231be 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1004,6 +1004,26 @@ public final class Bukkit { @@ -82,7 +82,7 @@ index 9265ee60edfb3df797e425e854c7d3c9c034a85c..f2753ef7d53ff3ff3531eaea89e816d7 * Gets a list of command aliases defined in the server properties. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 968a5e18a023c92158a753f6d8fce4b2d0f0de48..b93359e86db14e3a680bcdd8d935e2692c8b64e0 100644 +index 1b8d6a3333a4fa9155b79644e683e2343c134e12..8ba2fbaab7428a42b506fd000fbc162f68ddaed1 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -853,6 +853,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0402-Add-PlayerFailMoveEvent.patch b/patches/api/0401-Add-PlayerFailMoveEvent.patch similarity index 100% rename from patches/api/0402-Add-PlayerFailMoveEvent.patch rename to patches/api/0401-Add-PlayerFailMoveEvent.patch diff --git a/patches/api/0403-Fix-custom-statistic-criteria-creation.patch b/patches/api/0402-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/api/0403-Fix-custom-statistic-criteria-creation.patch rename to patches/api/0402-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/api/0404-SculkCatalyst-bloom-API.patch b/patches/api/0403-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/api/0404-SculkCatalyst-bloom-API.patch rename to patches/api/0403-SculkCatalyst-bloom-API.patch diff --git a/patches/api/0405-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0404-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/api/0405-API-for-an-entity-s-scoreboard-name.patch rename to patches/api/0404-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/api/0406-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0405-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 97% rename from patches/api/0406-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/api/0405-Deprecate-and-replace-methods-with-old-StructureType.patch index 72be0347a9..a832ca9f1d 100644 --- a/patches/api/0406-Deprecate-and-replace-methods-with-old-StructureType.patch +++ b/patches/api/0405-Deprecate-and-replace-methods-with-old-StructureType.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index f2753ef7d53ff3ff3531eaea89e816d7d8ce8b15..7e70b9b34b170b1c00dd920fabc0e14ed4a14955 100644 +index 52c601328bbf5c1642aa620c8bb466a9d2d231be..c8fa12acaf52cd3923a7a8702ccc50cfdc9170a2 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -949,9 +949,6 @@ public final class Bukkit { @@ -84,7 +84,7 @@ index f2753ef7d53ff3ff3531eaea89e816d7d8ce8b15..7e70b9b34b170b1c00dd920fabc0e14e /** * Reloads the server, refreshing settings and plugin information. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index b93359e86db14e3a680bcdd8d935e2692c8b64e0..f2be9647e015761ef7f56331be932a39cb6a5e8b 100644 +index 8ba2fbaab7428a42b506fd000fbc162f68ddaed1..50ffca9bccfb582d58ccb13f0decf66e5d91aef3 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -817,16 +817,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0407-Add-Listing-API-for-Player.patch b/patches/api/0406-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/api/0407-Add-Listing-API-for-Player.patch rename to patches/api/0406-Add-Listing-API-for-Player.patch diff --git a/patches/api/0408-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0407-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/api/0408-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/api/0407-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/api/0409-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0408-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/api/0409-Fix-NPE-on-Boat-getStatus.patch rename to patches/api/0408-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/api/0410-Expand-Pose-API.patch b/patches/api/0409-Expand-Pose-API.patch similarity index 100% rename from patches/api/0410-Expand-Pose-API.patch rename to patches/api/0409-Expand-Pose-API.patch diff --git a/patches/api/0411-MerchantRecipe-add-copy-constructor.patch b/patches/api/0410-MerchantRecipe-add-copy-constructor.patch similarity index 100% rename from patches/api/0411-MerchantRecipe-add-copy-constructor.patch rename to patches/api/0410-MerchantRecipe-add-copy-constructor.patch diff --git a/patches/api/0412-More-DragonBattle-API.patch b/patches/api/0411-More-DragonBattle-API.patch similarity index 100% rename from patches/api/0412-More-DragonBattle-API.patch rename to patches/api/0411-More-DragonBattle-API.patch diff --git a/patches/api/0413-Add-PlayerPickItemEvent.patch b/patches/api/0412-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/api/0413-Add-PlayerPickItemEvent.patch rename to patches/api/0412-Add-PlayerPickItemEvent.patch diff --git a/patches/api/0414-Allow-trident-custom-damage.patch b/patches/api/0413-Allow-trident-custom-damage.patch similarity index 100% rename from patches/api/0414-Allow-trident-custom-damage.patch rename to patches/api/0413-Allow-trident-custom-damage.patch diff --git a/patches/api/0415-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0414-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/api/0415-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/api/0414-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/api/0416-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0415-Limit-setBurnTime-to-valid-short-values.patch similarity index 100% rename from patches/api/0416-Limit-setBurnTime-to-valid-short-values.patch rename to patches/api/0415-Limit-setBurnTime-to-valid-short-values.patch diff --git a/patches/api/0417-Add-OfflinePlayer-isConnected.patch b/patches/api/0416-Add-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/api/0417-Add-OfflinePlayer-isConnected.patch rename to patches/api/0416-Add-OfflinePlayer-isConnected.patch diff --git a/patches/api/0418-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0417-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/api/0418-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/api/0417-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/api/0419-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0418-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/api/0419-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/api/0418-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/api/0420-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0419-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch similarity index 100% rename from patches/api/0420-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch rename to patches/api/0419-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch diff --git a/patches/api/0421-Add-player-idle-duration-API.patch b/patches/api/0420-Add-player-idle-duration-API.patch similarity index 100% rename from patches/api/0421-Add-player-idle-duration-API.patch rename to patches/api/0420-Add-player-idle-duration-API.patch diff --git a/patches/api/0422-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0421-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/api/0422-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/api/0421-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/api/0423-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0422-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/api/0423-Add-predicate-for-blocks-when-raytracing.patch rename to patches/api/0422-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/api/0424-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0423-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/api/0424-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/api/0423-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/api/0425-Attribute-Modifier-API-improvements.patch b/patches/api/0424-Attribute-Modifier-API-improvements.patch similarity index 100% rename from patches/api/0425-Attribute-Modifier-API-improvements.patch rename to patches/api/0424-Attribute-Modifier-API-improvements.patch diff --git a/patches/api/0426-Expand-LingeringPotion-API.patch b/patches/api/0425-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/api/0426-Expand-LingeringPotion-API.patch rename to patches/api/0425-Expand-LingeringPotion-API.patch diff --git a/patches/api/0427-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0426-Remove-unnecessary-durability-check-in-ItemStack-isS.patch similarity index 100% rename from patches/api/0427-Remove-unnecessary-durability-check-in-ItemStack-isS.patch rename to patches/api/0426-Remove-unnecessary-durability-check-in-ItemStack-isS.patch diff --git a/patches/api/0428-Add-Structure-check-API.patch b/patches/api/0427-Add-Structure-check-API.patch similarity index 100% rename from patches/api/0428-Add-Structure-check-API.patch rename to patches/api/0427-Add-Structure-check-API.patch diff --git a/patches/api/0429-Experimental-annotations-change.patch b/patches/api/0428-Experimental-annotations-change.patch similarity index 100% rename from patches/api/0429-Experimental-annotations-change.patch rename to patches/api/0428-Experimental-annotations-change.patch diff --git a/patches/api/0430-Add-more-scoreboard-API.patch b/patches/api/0429-Add-more-scoreboard-API.patch similarity index 100% rename from patches/api/0430-Add-more-scoreboard-API.patch rename to patches/api/0429-Add-more-scoreboard-API.patch diff --git a/patches/api/0431-Improve-Registry.patch b/patches/api/0430-Improve-Registry.patch similarity index 99% rename from patches/api/0431-Improve-Registry.patch rename to patches/api/0430-Improve-Registry.patch index 45bd41d64f..ebb0b7b8e8 100644 --- a/patches/api/0431-Improve-Registry.patch +++ b/patches/api/0430-Improve-Registry.patch @@ -49,7 +49,7 @@ index 62d2b3f950860dee0898d77b0a29635c3f9a7e23..98fdfc8978fea1937e31a7427433a192 @Override public @NotNull String translationKey() { diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java -index 7870a796e719148a42d18f1497b56c0d8f651a43..ff82bf3ea959c78e71ec7b0972a2d472f20aaf04 100644 +index 04dfab3fb9a9a3bc7e69cb0c1f5346f3c7d87d72..82381ea98af1c9216a2989ea83ba4aa90ba69741 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java @@ -367,6 +367,79 @@ public interface Registry extends Iterable { diff --git a/patches/api/0432-Add-experience-points-API.patch b/patches/api/0431-Add-experience-points-API.patch similarity index 100% rename from patches/api/0432-Add-experience-points-API.patch rename to patches/api/0431-Add-experience-points-API.patch diff --git a/patches/api/0433-Add-missing-InventoryType.patch b/patches/api/0432-Add-missing-InventoryType.patch similarity index 100% rename from patches/api/0433-Add-missing-InventoryType.patch rename to patches/api/0432-Add-missing-InventoryType.patch diff --git a/patches/api/0434-Add-drops-to-shear-events.patch b/patches/api/0433-Add-drops-to-shear-events.patch similarity index 100% rename from patches/api/0434-Add-drops-to-shear-events.patch rename to patches/api/0433-Add-drops-to-shear-events.patch diff --git a/patches/api/0435-Add-HiddenPotionEffect-API.patch b/patches/api/0434-Add-HiddenPotionEffect-API.patch similarity index 98% rename from patches/api/0435-Add-HiddenPotionEffect-API.patch rename to patches/api/0434-Add-HiddenPotionEffect-API.patch index 281fad5e4b..03c31e4ff8 100644 --- a/patches/api/0435-Add-HiddenPotionEffect-API.patch +++ b/patches/api/0434-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 ad3717d963f28751d410e6688ae64a4c1175871d..8369da45206d2606f0715f3d803163dd8028251e 100644 +index 4aab0144601788a7902c9fdabb68744d9e33a345..51a428473e702be3ab79bd1e579d1114f747791b 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -591,6 +591,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0436-Add-PlayerShieldDisableEvent.patch b/patches/api/0435-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/api/0436-Add-PlayerShieldDisableEvent.patch rename to patches/api/0435-Add-PlayerShieldDisableEvent.patch diff --git a/patches/api/0437-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0436-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch similarity index 100% rename from patches/api/0437-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch rename to patches/api/0436-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch diff --git a/patches/api/0438-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0437-Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/api/0438-Add-BlockStateMeta-clearBlockState.patch rename to patches/api/0437-Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/api/0439-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0438-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/api/0439-Expose-LootTable-of-DecoratedPot.patch rename to patches/api/0438-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/api/0440-Add-ShulkerDuplicateEvent.patch b/patches/api/0439-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/api/0440-Add-ShulkerDuplicateEvent.patch rename to patches/api/0439-Add-ShulkerDuplicateEvent.patch diff --git a/patches/api/0441-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0440-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/api/0441-Add-api-for-spawn-egg-texture-colors.patch rename to patches/api/0440-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/api/0442-Add-Lifecycle-Event-system.patch b/patches/api/0441-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/api/0442-Add-Lifecycle-Event-system.patch rename to patches/api/0441-Add-Lifecycle-Event-system.patch diff --git a/patches/api/0443-ItemStack-Tooltip-API.patch b/patches/api/0442-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/api/0443-ItemStack-Tooltip-API.patch rename to patches/api/0442-ItemStack-Tooltip-API.patch diff --git a/patches/api/0444-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0443-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/api/0444-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/api/0443-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/api/0445-Add-FluidState-API.patch b/patches/api/0444-Add-FluidState-API.patch similarity index 100% rename from patches/api/0445-Add-FluidState-API.patch rename to patches/api/0444-Add-FluidState-API.patch diff --git a/patches/api/0446-add-number-format-api.patch b/patches/api/0445-add-number-format-api.patch similarity index 100% rename from patches/api/0446-add-number-format-api.patch rename to patches/api/0445-add-number-format-api.patch diff --git a/patches/api/0447-improve-BanList-types.patch b/patches/api/0446-improve-BanList-types.patch similarity index 96% rename from patches/api/0447-improve-BanList-types.patch rename to patches/api/0446-improve-BanList-types.patch index 56f652975a..47e1822e8b 100644 --- a/patches/api/0447-improve-BanList-types.patch +++ b/patches/api/0446-improve-BanList-types.patch @@ -68,7 +68,7 @@ index a77c0411a68a9bad33ddfb335b7a996a843e478c..739d9d3ec789e58c10c8d818a9ca59ce /** * Banned player names diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 7e70b9b34b170b1c00dd920fabc0e14ed4a14955..419c056faf0d49d9b0435feb01252e87e227b9a9 100644 +index c8fa12acaf52cd3923a7a8702ccc50cfdc9170a2..e20e4239a5a1f952e1c70e899549989d5e42f73c 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1663,11 +1663,27 @@ public final class Bukkit { @@ -100,7 +100,7 @@ index 7e70b9b34b170b1c00dd920fabc0e14ed4a14955..419c056faf0d49d9b0435feb01252e87 /** * Gets a set containing all player operators. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index f2be9647e015761ef7f56331be932a39cb6a5e8b..5aa64ea39ebd92e5067c53cea49a8685c0b9eee4 100644 +index 50ffca9bccfb582d58ccb13f0decf66e5d91aef3..6246251caf2c6f025c824b8e7a944b8d48751fa1 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1425,10 +1425,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0448-Suspicious-Effect-Entry-API.patch b/patches/api/0447-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/api/0448-Suspicious-Effect-Entry-API.patch rename to patches/api/0447-Suspicious-Effect-Entry-API.patch diff --git a/patches/api/0449-Fix-DamageSource-API.patch b/patches/api/0448-Fix-DamageSource-API.patch similarity index 100% rename from patches/api/0449-Fix-DamageSource-API.patch rename to patches/api/0448-Fix-DamageSource-API.patch diff --git a/patches/api/0450-Expanded-Hopper-API.patch b/patches/api/0449-Expanded-Hopper-API.patch similarity index 100% rename from patches/api/0450-Expanded-Hopper-API.patch rename to patches/api/0449-Expanded-Hopper-API.patch diff --git a/patches/api/0451-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0450-Clone-mutables-to-prevent-unexpected-issues.patch similarity index 100% rename from patches/api/0451-Clone-mutables-to-prevent-unexpected-issues.patch rename to patches/api/0450-Clone-mutables-to-prevent-unexpected-issues.patch diff --git a/patches/api/0452-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0451-Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/api/0452-Add-BlockBreakProgressUpdateEvent.patch rename to patches/api/0451-Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/api/0453-Deprecate-ItemStack-setType.patch b/patches/api/0452-Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/api/0453-Deprecate-ItemStack-setType.patch rename to patches/api/0452-Deprecate-ItemStack-setType.patch diff --git a/patches/api/0454-Item-Mutation-Fixes.patch b/patches/api/0453-Item-Mutation-Fixes.patch similarity index 100% rename from patches/api/0454-Item-Mutation-Fixes.patch rename to patches/api/0453-Item-Mutation-Fixes.patch diff --git a/patches/api/0455-API-for-checking-sent-chunks.patch b/patches/api/0454-API-for-checking-sent-chunks.patch similarity index 100% rename from patches/api/0455-API-for-checking-sent-chunks.patch rename to patches/api/0454-API-for-checking-sent-chunks.patch diff --git a/patches/api/0456-Add-CartographyItemEvent.patch b/patches/api/0455-Add-CartographyItemEvent.patch similarity index 100% rename from patches/api/0456-Add-CartographyItemEvent.patch rename to patches/api/0455-Add-CartographyItemEvent.patch diff --git a/patches/api/0457-More-Raid-API.patch b/patches/api/0456-More-Raid-API.patch similarity index 100% rename from patches/api/0457-More-Raid-API.patch rename to patches/api/0456-More-Raid-API.patch diff --git a/patches/api/0458-Fix-SpawnerEntry-Equipment-API.patch b/patches/api/0457-Fix-SpawnerEntry-Equipment-API.patch similarity index 100% rename from patches/api/0458-Fix-SpawnerEntry-Equipment-API.patch rename to patches/api/0457-Fix-SpawnerEntry-Equipment-API.patch diff --git a/patches/api/0459-Fix-ItemFlags.patch b/patches/api/0458-Fix-ItemFlags.patch similarity index 100% rename from patches/api/0459-Fix-ItemFlags.patch rename to patches/api/0458-Fix-ItemFlags.patch diff --git a/patches/api/0460-Allow-modifying-library-loader-jars-bytecode.patch b/patches/api/0459-Allow-modifying-library-loader-jars-bytecode.patch similarity index 100% rename from patches/api/0460-Allow-modifying-library-loader-jars-bytecode.patch rename to patches/api/0459-Allow-modifying-library-loader-jars-bytecode.patch diff --git a/patches/api/0461-Add-hook-to-remap-library-jars.patch b/patches/api/0460-Add-hook-to-remap-library-jars.patch similarity index 100% rename from patches/api/0461-Add-hook-to-remap-library-jars.patch rename to patches/api/0460-Add-hook-to-remap-library-jars.patch diff --git a/patches/api/0462-Add-GameMode-isInvulnerable.patch b/patches/api/0461-Add-GameMode-isInvulnerable.patch similarity index 100% rename from patches/api/0462-Add-GameMode-isInvulnerable.patch rename to patches/api/0461-Add-GameMode-isInvulnerable.patch diff --git a/patches/api/0463-Expose-hasColor-to-leather-armor.patch b/patches/api/0462-Expose-hasColor-to-leather-armor.patch similarity index 100% rename from patches/api/0463-Expose-hasColor-to-leather-armor.patch rename to patches/api/0462-Expose-hasColor-to-leather-armor.patch diff --git a/patches/api/0464-Add-missing-wind-charge-damage-type.patch b/patches/api/0463-Add-missing-wind-charge-damage-type.patch similarity index 100% rename from patches/api/0464-Add-missing-wind-charge-damage-type.patch rename to patches/api/0463-Add-missing-wind-charge-damage-type.patch diff --git a/patches/api/0465-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0464-Added-API-to-get-player-ha-proxy-address.patch similarity index 100% rename from patches/api/0465-Added-API-to-get-player-ha-proxy-address.patch rename to patches/api/0464-Added-API-to-get-player-ha-proxy-address.patch diff --git a/patches/api/0466-More-Chest-Block-API.patch b/patches/api/0465-More-Chest-Block-API.patch similarity index 100% rename from patches/api/0466-More-Chest-Block-API.patch rename to patches/api/0465-More-Chest-Block-API.patch diff --git a/patches/api/0467-Brigadier-based-command-API.patch b/patches/api/0466-Brigadier-based-command-API.patch similarity index 100% rename from patches/api/0467-Brigadier-based-command-API.patch rename to patches/api/0466-Brigadier-based-command-API.patch diff --git a/patches/api/0468-Fix-issues-with-recipe-API.patch b/patches/api/0467-Fix-issues-with-recipe-API.patch similarity index 100% rename from patches/api/0468-Fix-issues-with-recipe-API.patch rename to patches/api/0467-Fix-issues-with-recipe-API.patch diff --git a/patches/api/0469-Fix-equipment-slot-and-group-API.patch b/patches/api/0468-Fix-equipment-slot-and-group-API.patch similarity index 100% rename from patches/api/0469-Fix-equipment-slot-and-group-API.patch rename to patches/api/0468-Fix-equipment-slot-and-group-API.patch diff --git a/patches/api/0470-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/api/0469-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch similarity index 100% rename from patches/api/0470-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch rename to patches/api/0469-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch diff --git a/patches/api/0471-General-ItemMeta-fixes.patch b/patches/api/0470-General-ItemMeta-fixes.patch similarity index 100% rename from patches/api/0471-General-ItemMeta-fixes.patch rename to patches/api/0470-General-ItemMeta-fixes.patch diff --git a/patches/api/0472-Add-missing-fishing-event-state.patch b/patches/api/0471-Add-missing-fishing-event-state.patch similarity index 100% rename from patches/api/0472-Add-missing-fishing-event-state.patch rename to patches/api/0471-Add-missing-fishing-event-state.patch diff --git a/patches/api/0473-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/api/0472-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch similarity index 100% rename from patches/api/0473-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch rename to patches/api/0472-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch diff --git a/patches/api/0474-Registry-Modification-API.patch b/patches/api/0473-Registry-Modification-API.patch similarity index 99% rename from patches/api/0474-Registry-Modification-API.patch rename to patches/api/0473-Registry-Modification-API.patch index 78231b787d..5362f96e91 100644 --- a/patches/api/0474-Registry-Modification-API.patch +++ b/patches/api/0473-Registry-Modification-API.patch @@ -795,7 +795,7 @@ index 0000000000000000000000000000000000000000..5fde17e97eddcd1d01ee39694c9159d0 + } +} diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java -index ff82bf3ea959c78e71ec7b0972a2d472f20aaf04..1392a1295349cfc43fbc115c912c1995779ffe62 100644 +index 82381ea98af1c9216a2989ea83ba4aa90ba69741..d81f687cba38ec930c555b001afc0df93c21731b 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java @@ -366,6 +366,27 @@ public interface Registry extends Iterable { diff --git a/patches/api/0475-Introduce-registry-entry-and-builders.patch b/patches/api/0474-Introduce-registry-entry-and-builders.patch similarity index 100% rename from patches/api/0475-Introduce-registry-entry-and-builders.patch rename to patches/api/0474-Introduce-registry-entry-and-builders.patch diff --git a/patches/api/0476-Proxy-ItemStack-to-CraftItemStack.patch b/patches/api/0475-Proxy-ItemStack-to-CraftItemStack.patch similarity index 100% rename from patches/api/0476-Proxy-ItemStack-to-CraftItemStack.patch rename to patches/api/0475-Proxy-ItemStack-to-CraftItemStack.patch diff --git a/patches/api/0477-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/api/0476-Make-a-PDC-view-accessible-directly-from-ItemStack.patch similarity index 100% rename from patches/api/0477-Make-a-PDC-view-accessible-directly-from-ItemStack.patch rename to patches/api/0476-Make-a-PDC-view-accessible-directly-from-ItemStack.patch diff --git a/patches/api/0478-Fix-HelpCommand-searching.patch b/patches/api/0477-Fix-HelpCommand-searching.patch similarity index 100% rename from patches/api/0478-Fix-HelpCommand-searching.patch rename to patches/api/0477-Fix-HelpCommand-searching.patch diff --git a/patches/api/0479-add-Plugin-getDataPath.patch b/patches/api/0478-add-Plugin-getDataPath.patch similarity index 100% rename from patches/api/0479-add-Plugin-getDataPath.patch rename to patches/api/0478-add-Plugin-getDataPath.patch diff --git a/patches/api/0480-Fix-PickupStatus-getting-reset.patch b/patches/api/0479-Fix-PickupStatus-getting-reset.patch similarity index 100% rename from patches/api/0480-Fix-PickupStatus-getting-reset.patch rename to patches/api/0479-Fix-PickupStatus-getting-reset.patch diff --git a/patches/api/0481-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0480-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch similarity index 100% rename from patches/api/0481-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch rename to patches/api/0480-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch diff --git a/patches/api/0482-Improve-StandardMessenger-exception-messages.patch b/patches/api/0481-Improve-StandardMessenger-exception-messages.patch similarity index 100% rename from patches/api/0482-Improve-StandardMessenger-exception-messages.patch rename to patches/api/0481-Improve-StandardMessenger-exception-messages.patch diff --git a/patches/api/0483-Add-even-more-Enchantment-API.patch b/patches/api/0482-Add-even-more-Enchantment-API.patch similarity index 100% rename from patches/api/0483-Add-even-more-Enchantment-API.patch rename to patches/api/0482-Add-even-more-Enchantment-API.patch diff --git a/patches/api/0484-Leashable-API.patch b/patches/api/0483-Leashable-API.patch similarity index 100% rename from patches/api/0484-Leashable-API.patch rename to patches/api/0483-Leashable-API.patch diff --git a/patches/api/0485-Add-enchantment-seed-update-API.patch b/patches/api/0484-Add-enchantment-seed-update-API.patch similarity index 100% rename from patches/api/0485-Add-enchantment-seed-update-API.patch rename to patches/api/0484-Add-enchantment-seed-update-API.patch diff --git a/patches/api/0486-Deprecate-for-removal-all-OldEnum-related-methods.patch b/patches/api/0485-Deprecate-for-removal-all-OldEnum-related-methods.patch similarity index 100% rename from patches/api/0486-Deprecate-for-removal-all-OldEnum-related-methods.patch rename to patches/api/0485-Deprecate-for-removal-all-OldEnum-related-methods.patch diff --git a/patches/api/0487-Add-FeatureFlag-API.patch b/patches/api/0486-Add-FeatureFlag-API.patch similarity index 100% rename from patches/api/0487-Add-FeatureFlag-API.patch rename to patches/api/0486-Add-FeatureFlag-API.patch diff --git a/patches/api/0488-Tag-Lifecycle-Events.patch b/patches/api/0487-Tag-Lifecycle-Events.patch similarity index 100% rename from patches/api/0488-Tag-Lifecycle-Events.patch rename to patches/api/0487-Tag-Lifecycle-Events.patch diff --git a/patches/api/0489-Item-serialization-as-json.patch b/patches/api/0488-Item-serialization-as-json.patch similarity index 100% rename from patches/api/0489-Item-serialization-as-json.patch rename to patches/api/0488-Item-serialization-as-json.patch diff --git a/patches/api/0490-create-TileStateInventoryHolder.patch b/patches/api/0489-create-TileStateInventoryHolder.patch similarity index 100% rename from patches/api/0490-create-TileStateInventoryHolder.patch rename to patches/api/0489-create-TileStateInventoryHolder.patch diff --git a/patches/server/0674-More-Projectile-API.patch b/patches/server/0674-More-Projectile-API.patch index 97f7eb71ab..b526158a7f 100644 --- a/patches/server/0674-More-Projectile-API.patch +++ b/patches/server/0674-More-Projectile-API.patch @@ -20,9 +20,12 @@ public net.minecraft.world.entity.projectile.Projectile leftOwner public net.minecraft.world.entity.projectile.Projectile preOnHit(Lnet/minecraft/world/phys/HitResult;)V public net.minecraft.world.entity.projectile.Projectile canHitEntity(Lnet/minecraft/world/entity/Entity;)Z public net.minecraft.world.entity.projectile.FireworkRocketEntity getDefaultItem()Lnet/minecraft/world/item/ItemStack; +public net.minecraft.world.item.CrossbowItem FIREWORK_POWER Co-authored-by: Nassim Jahnke Co-authored-by: SoSeDiK +Co-authored-by: MelnCat +Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java index 5b7734020b496ade3740d92908ad2d399bfd55e6..e70ca1b2e6fbbc1f20e65429298d01b4ebd2dd29 100644 @@ -515,10 +518,27 @@ index 6e2f91423371ead9890095cf4b1e2299c4dcba28..9d8f4b7176e60180565e3134a14ecf19 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 097f03c83a90f476b74834407d2dcd0e98fe010a..741cc56304005c48b26966f617d282bae7a87ee6 100644 +index 097f03c83a90f476b74834407d2dcd0e98fe010a..877e3d20edba3fe2ea6b51d0b54ec8893bd112ed 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -596,7 +596,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -569,8 +569,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { + } + + @Override +- @SuppressWarnings("unchecked") + public T launchProjectile(Class projectile, Vector velocity) { ++ // Paper start - launchProjectile consumer ++ return this.launchProjectile(projectile, velocity, null); ++ } ++ ++ @Override ++ @SuppressWarnings("unchecked") ++ public T launchProjectile(Class projectile, Vector velocity, java.util.function.Consumer function) { ++ // Paper end - launchProjectile consumer + Preconditions.checkState(!this.getHandle().generation, "Cannot launch projectile during world generation"); + + net.minecraft.world.level.Level world = ((CraftWorld) this.getWorld()).getHandle(); +@@ -596,7 +603,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { } else { launch = new net.minecraft.world.entity.projectile.Arrow(world, this.getHandle(), new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.ARROW), null); } @@ -527,7 +547,7 @@ index 097f03c83a90f476b74834407d2dcd0e98fe010a..741cc56304005c48b26966f617d282ba } else if (ThrownPotion.class.isAssignableFrom(projectile)) { if (LingeringPotion.class.isAssignableFrom(projectile)) { launch = new net.minecraft.world.entity.projectile.ThrownPotion(world, this.getHandle()); -@@ -622,10 +622,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -622,10 +629,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { launch = new net.minecraft.world.entity.projectile.WitherSkull(world, this.getHandle(), vec); } else if (DragonFireball.class.isAssignableFrom(projectile)) { launch = new net.minecraft.world.entity.projectile.DragonFireball(world, this.getHandle(), vec); @@ -548,15 +568,47 @@ index 097f03c83a90f476b74834407d2dcd0e98fe010a..741cc56304005c48b26966f617d282ba } else { launch = new LargeFireball(world, this.getHandle(), vec, 1); } -@@ -650,7 +656,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -650,8 +663,26 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { } else if (Firework.class.isAssignableFrom(projectile)) { Location location = this.getEyeLocation(); - launch = new FireworkRocketEntity(world, net.minecraft.world.item.ItemStack.EMPTY, this.getHandle()); -+ launch = new FireworkRocketEntity(world, FireworkRocketEntity.getDefaultItem(), this.getHandle()); // Paper - pass correct default to rocket for data storage - launch.moveTo(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); +- launch.moveTo(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); ++ // Paper start - see CrossbowItem ++ launch = new FireworkRocketEntity(world, FireworkRocketEntity.getDefaultItem(), this.getHandle(), location.getX(), location.getY() - 0.15F, location.getZ(), true); // Paper - pass correct default to rocket for data storage & see CrossbowItem for regular launch without elytra boost ++ ++ // Lifted from net.minecraft.world.item.ProjectileWeaponItem.shoot ++ float f2 = /* net.minecraft.world.item.enchantment.EnchantmentHelper.processProjectileSpread((ServerLevel) world, new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.CROSSBOW), this.getHandle(), 0.0F); */ 0; // Just shortcut this to 0, no need to do any calculations on a non existing stack ++ int projectileSize = 1; ++ int i = 0; ++ ++ float f3 = projectileSize == 1 ? 0.0F : 2.0F * f2 / (float) (projectileSize - 1); ++ float f4 = (float) ((projectileSize - 1) % 2) * f3 / 2.0F; ++ float f5 = 1.0F; ++ float yaw = f4 + f5 * (float) ((i + 1) / 2) * f3; ++ ++ // Lifted from net.minecraft.world.item.CrossbowItem.shootProjectile ++ Vec3 vec3 = this.getHandle().getUpVector(1.0F); ++ org.joml.Quaternionf quaternionf = new org.joml.Quaternionf().setAngleAxis((double)(yaw * (float) (Math.PI / 180.0)), vec3.x, vec3.y, vec3.z); ++ Vec3 vec32 = this.getHandle().getViewVector(1.0F); ++ org.joml.Vector3f vector3f = vec32.toVector3f().rotate(quaternionf); ++ ((FireworkRocketEntity) launch).shoot((double)vector3f.x(), (double)vector3f.y(), (double)vector3f.z(), net.minecraft.world.item.CrossbowItem.FIREWORK_POWER, 1.0F); ++ // Paper end } + Preconditions.checkArgument(launch != null, "Projectile (%s) not supported", projectile.getName()); +@@ -659,6 +690,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { + if (velocity != null) { + ((T) launch.getBukkitEntity()).setVelocity(velocity); + } ++ // Paper start - launchProjectile consumer ++ if (function != null) { ++ function.accept((T) launch.getBukkitEntity()); ++ } ++ // Paper end - launchProjectile consumer + + world.addFreshEntity(launch); + return (T) launch.getBukkitEntity(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java index 70cbc6c668c60e9d608ca7013b72f9b916c05c2d..47633f05b4fab1dcabc2117e7645fe6d6949622a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java @@ -812,3 +864,140 @@ index e8a455eb5e17bcfcae3f03664f2b47773fbdf37e..08178a88ba7d0881a6c2843eef24a846 return ((CraftItemType) CraftItemType.minecraftToBukkitNew(item.getItem())).getItemMeta(item); } +diff --git a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java +index 8b57044518fbb0fd507da6ae3ff12b99eff70b37..e3312df146b942568ccee6595ae609c7d6a4f68f 100644 +--- a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java ++++ b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java +@@ -56,90 +56,68 @@ public class CraftBlockProjectileSource implements BlockProjectileSource { + + @Override + public T launchProjectile(Class projectile, Vector velocity) { ++ // Paper start - launchProjectile consumer ++ return this.launchProjectile(projectile, velocity, null); ++ } ++ ++ @Override ++ public T launchProjectile(Class projectile, Vector velocity, java.util.function.Consumer function) { ++ // Paper end - launchProjectile consumer + Preconditions.checkArgument(this.getBlock().getType() == Material.DISPENSER, "Block is no longer dispenser"); +- // Copied from BlockDispenser.dispense() +- BlockSource sourceblock = new BlockSource((ServerLevel) this.dispenserBlock.getLevel(), this.dispenserBlock.getBlockPos(), this.dispenserBlock.getBlockState(), this.dispenserBlock); +- // Copied from DispenseBehaviorProjectile +- Position iposition = DispenserBlock.getDispensePosition(sourceblock); +- Direction enumdirection = (Direction) sourceblock.state().getValue(DispenserBlock.FACING); +- net.minecraft.world.level.Level world = this.dispenserBlock.getLevel(); +- net.minecraft.world.entity.Entity launch = null; + ++ // Paper start - rewrite whole method to match ProjectileDispenseBehavior ++ net.minecraft.world.item.Item item = null; + if (Snowball.class.isAssignableFrom(projectile)) { +- launch = new net.minecraft.world.entity.projectile.Snowball(world, iposition.x(), iposition.y(), iposition.z()); ++ item = net.minecraft.world.item.Items.SNOWBALL; + } else if (Egg.class.isAssignableFrom(projectile)) { +- launch = new ThrownEgg(world, iposition.x(), iposition.y(), iposition.z()); +- } else if (EnderPearl.class.isAssignableFrom(projectile)) { +- launch = new ThrownEnderpearl(world, null); +- launch.setPos(iposition.x(), iposition.y(), iposition.z()); ++ item = net.minecraft.world.item.Items.EGG; + } else if (ThrownExpBottle.class.isAssignableFrom(projectile)) { +- launch = new ThrownExperienceBottle(world, iposition.x(), iposition.y(), iposition.z()); ++ item = net.minecraft.world.item.Items.EXPERIENCE_BOTTLE; + } else if (ThrownPotion.class.isAssignableFrom(projectile)) { + if (LingeringPotion.class.isAssignableFrom(projectile)) { +- launch = new net.minecraft.world.entity.projectile.ThrownPotion(world, iposition.x(), iposition.y(), iposition.z()); +- ((net.minecraft.world.entity.projectile.ThrownPotion) launch).setItem(CraftItemStack.asNMSCopy(new ItemStack(org.bukkit.Material.LINGERING_POTION, 1))); ++ item = net.minecraft.world.item.Items.LINGERING_POTION; + } else { +- launch = new net.minecraft.world.entity.projectile.ThrownPotion(world, iposition.x(), iposition.y(), iposition.z()); +- ((net.minecraft.world.entity.projectile.ThrownPotion) launch).setItem(CraftItemStack.asNMSCopy(new ItemStack(org.bukkit.Material.SPLASH_POTION, 1))); ++ item = net.minecraft.world.item.Items.SPLASH_POTION; + } + } else if (AbstractArrow.class.isAssignableFrom(projectile)) { +- if (TippedArrow.class.isAssignableFrom(projectile)) { +- launch = new net.minecraft.world.entity.projectile.Arrow(world, iposition.x(), iposition.y(), iposition.z(), new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.ARROW), null); +- ((Arrow) launch.getBukkitEntity()).setBasePotionType(PotionType.WATER); +- } else if (SpectralArrow.class.isAssignableFrom(projectile)) { +- launch = new net.minecraft.world.entity.projectile.SpectralArrow(world, iposition.x(), iposition.y(), iposition.z(), new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.SPECTRAL_ARROW), null); ++ if (SpectralArrow.class.isAssignableFrom(projectile)) { ++ item = net.minecraft.world.item.Items.SPECTRAL_ARROW; + } else { +- launch = new net.minecraft.world.entity.projectile.Arrow(world, iposition.x(), iposition.y(), iposition.z(), new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.ARROW), null); +- } +- ((net.minecraft.world.entity.projectile.AbstractArrow) launch).pickup = net.minecraft.world.entity.projectile.AbstractArrow.Pickup.ALLOWED; +- ((net.minecraft.world.entity.projectile.AbstractArrow) launch).projectileSource = this; +- } else if (Fireball.class.isAssignableFrom(projectile)) { +- double d0 = iposition.x() + (double) ((float) enumdirection.getStepX() * 0.3F); +- double d1 = iposition.y() + (double) ((float) enumdirection.getStepY() * 0.3F); +- double d2 = iposition.z() + (double) ((float) enumdirection.getStepZ() * 0.3F); +- RandomSource random = world.random; +- double d3 = random.nextGaussian() * 0.05D + (double) enumdirection.getStepX(); +- double d4 = random.nextGaussian() * 0.05D + (double) enumdirection.getStepY(); +- double d5 = random.nextGaussian() * 0.05D + (double) enumdirection.getStepZ(); +- +- if (SmallFireball.class.isAssignableFrom(projectile)) { +- launch = new net.minecraft.world.entity.projectile.SmallFireball(world, null, new Vec3(d0, d1, d2)); +- } else if (WitherSkull.class.isAssignableFrom(projectile)) { +- launch = EntityType.WITHER_SKULL.create(world); +- launch.setPos(d0, d1, d2); +- +- ((AbstractHurtingProjectile) launch).assignDirectionalMovement(new Vec3(d3, d4, d5), 0.1D); +- } else { +- launch = EntityType.FIREBALL.create(world); +- launch.setPos(d0, d1, d2); +- +- ((AbstractHurtingProjectile) launch).assignDirectionalMovement(new Vec3(d3, d4, d5), 0.1D); ++ item = net.minecraft.world.item.Items.ARROW; + } ++ } else if (org.bukkit.entity.WindCharge.class.isAssignableFrom(projectile)) { ++ item = net.minecraft.world.item.Items.WIND_CHARGE; ++ } else if (org.bukkit.entity.Firework.class.isAssignableFrom(projectile)) { ++ item = net.minecraft.world.item.Items.FIREWORK_ROCKET; ++ } else if (SmallFireball.class.isAssignableFrom(projectile)) { ++ item = net.minecraft.world.item.Items.FIRE_CHARGE; ++ } + +- ((AbstractHurtingProjectile) launch).projectileSource = this; ++ if (!(item instanceof net.minecraft.world.item.ProjectileItem projectileItem)) { ++ throw new IllegalArgumentException("Projectile '%s' is not supported".formatted(projectile.getSimpleName())); + } + +- Preconditions.checkArgument(launch != null, "Projectile not supported"); ++ net.minecraft.world.item.ProjectileItem.DispenseConfig config = projectileItem.createDispenseConfig(); ++ net.minecraft.world.level.block.state.BlockState state = this.dispenserBlock.getBlockState(); ++ net.minecraft.world.level.Level world = this.dispenserBlock.getLevel(); ++ BlockSource pointer = new BlockSource((ServerLevel) world, this.dispenserBlock.getBlockPos(), state, this.dispenserBlock); // copied from DispenseBlock#dispenseFrom ++ Direction facing = state.getValue(DispenserBlock.FACING); ++ Position pos = config.positionFunction().getDispensePosition(pointer, facing); + +- if (launch instanceof net.minecraft.world.entity.projectile.Projectile) { +- if (launch instanceof ThrowableProjectile) { +- ((ThrowableProjectile) launch).projectileSource = this; +- } +- // Values from DispenseBehaviorProjectile +- float a = 6.0F; +- float b = 1.1F; +- if (launch instanceof net.minecraft.world.entity.projectile.ThrownPotion || launch instanceof ThrownExpBottle) { +- // Values from respective DispenseBehavior classes +- a *= 0.5F; +- b *= 1.25F; +- } +- // Copied from DispenseBehaviorProjectile +- ((net.minecraft.world.entity.projectile.Projectile) launch).shoot((double) enumdirection.getStepX(), (double) ((float) enumdirection.getStepY() + 0.1F), (double) enumdirection.getStepZ(), b, a); +- } ++ net.minecraft.world.entity.projectile.Projectile launch = projectileItem.asProjectile(world, pos, new net.minecraft.world.item.ItemStack(item), facing); ++ // some projectile are not shoot and doesn't rely on the config for power/uncertainty ++ projectileItem.shoot(launch, facing.getStepX(), facing.getStepY(), facing.getStepZ(), config.power(), config.uncertainty()); ++ launch.projectileSource = this; ++ // Paper end + + if (velocity != null) { + ((T) launch.getBukkitEntity()).setVelocity(velocity); + } ++ // Paper start ++ if (function != null) { ++ function.accept((T) launch.getBukkitEntity()); ++ } ++ // Paper end + + world.addFreshEntity(launch); + return (T) launch.getBukkitEntity(); diff --git a/patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch deleted file mode 100644 index 9a55defb23..0000000000 --- a/patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MelnCat -Date: Mon, 19 Sep 2022 14:16:10 -0700 -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 741cc56304005c48b26966f617d282bae7a87ee6..e6727100c3ec18a32e08d027cd1b4c39b913d554 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -569,8 +569,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { - } - - @Override -- @SuppressWarnings("unchecked") - public T launchProjectile(Class projectile, Vector velocity) { -+ // Paper start - launchProjectile consumer -+ return this.launchProjectile(projectile, velocity, null); -+ } -+ -+ @Override -+ @SuppressWarnings("unchecked") -+ public T launchProjectile(Class projectile, Vector velocity, java.util.function.Consumer function) { -+ // Paper end - launchProjectile consumer - Preconditions.checkState(!this.getHandle().generation, "Cannot launch projectile during world generation"); - - net.minecraft.world.level.Level world = ((CraftWorld) this.getWorld()).getHandle(); -@@ -665,6 +672,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { - if (velocity != null) { - ((T) launch.getBukkitEntity()).setVelocity(velocity); - } -+ // Paper start - launchProjectile consumer -+ if (function != null) { -+ function.accept((T) launch.getBukkitEntity()); -+ } -+ // Paper end - launchProjectile consumer - - world.addFreshEntity(launch); - return (T) launch.getBukkitEntity(); -diff --git a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java -index 8b57044518fbb0fd507da6ae3ff12b99eff70b37..2a6c4a74ff065110bb09b528f2d5f80b560a587a 100644 ---- a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java -+++ b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java -@@ -56,6 +56,13 @@ public class CraftBlockProjectileSource implements BlockProjectileSource { - - @Override - public T launchProjectile(Class projectile, Vector velocity) { -+ // Paper start - launchProjectile consumer -+ return this.launchProjectile(projectile, velocity, null); -+ } -+ -+ @Override -+ public T launchProjectile(Class projectile, Vector velocity, java.util.function.Consumer function) { -+ // Paper end - launchProjectile consumer - Preconditions.checkArgument(this.getBlock().getType() == Material.DISPENSER, "Block is no longer dispenser"); - // Copied from BlockDispenser.dispense() - BlockSource sourceblock = new BlockSource((ServerLevel) this.dispenserBlock.getLevel(), this.dispenserBlock.getBlockPos(), this.dispenserBlock.getBlockState(), this.dispenserBlock); -@@ -140,6 +147,11 @@ public class CraftBlockProjectileSource implements BlockProjectileSource { - if (velocity != null) { - ((T) launch.getBukkitEntity()).setVelocity(velocity); - } -+ // Paper start -+ if (function != null) { -+ function.accept((T) launch.getBukkitEntity()); -+ } -+ // Paper end - - world.addFreshEntity(launch); - return (T) launch.getBukkitEntity(); diff --git a/patches/server/0740-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0739-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0740-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0739-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0741-Configurable-chat-thread-limit.patch b/patches/server/0740-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0741-Configurable-chat-thread-limit.patch rename to patches/server/0740-Configurable-chat-thread-limit.patch diff --git a/patches/server/0742-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0741-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0742-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0741-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0743-fix-Jigsaw-block-kicking-user.patch b/patches/server/0742-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0743-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0742-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0744-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0743-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0744-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0743-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0745-Add-getDrops-to-BlockState.patch b/patches/server/0744-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0745-Add-getDrops-to-BlockState.patch rename to patches/server/0744-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0746-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0745-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0746-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0745-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0747-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0746-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0747-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0746-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0748-Fix-custom-piglin-loved-items.patch b/patches/server/0747-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0748-Fix-custom-piglin-loved-items.patch rename to patches/server/0747-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0749-EntityPickupItemEvent-fixes.patch b/patches/server/0748-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0749-EntityPickupItemEvent-fixes.patch rename to patches/server/0748-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0750-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0749-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0750-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0749-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0751-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0750-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0751-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0750-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0752-Elder-Guardian-appearance-API.patch b/patches/server/0751-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0752-Elder-Guardian-appearance-API.patch rename to patches/server/0751-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0753-Add-entity-knockback-API.patch b/patches/server/0752-Add-entity-knockback-API.patch similarity index 86% rename from patches/server/0753-Add-entity-knockback-API.patch rename to patches/server/0752-Add-entity-knockback-API.patch index 0e9f0b0fd8..b50878265d 100644 --- a/patches/server/0753-Add-entity-knockback-API.patch +++ b/patches/server/0752-Add-entity-knockback-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add entity knockback API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index f6999207658253699ca8f8df8bfa19f39cd59f86..8babdfe0c6bd921f95cf55313197d576035b0891 100644 +index 877e3d20edba3fe2ea6b51d0b54ec8893bd112ed..2a7fffa71106327d0ffee632408d45faaec76702 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1109,4 +1109,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1127,4 +1127,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { throw new UnsupportedOperationException("Cannot set the hurt direction on a non player"); } // Paper end - hurt direction API diff --git a/patches/server/0754-Detect-headless-JREs.patch b/patches/server/0753-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0754-Detect-headless-JREs.patch rename to patches/server/0753-Detect-headless-JREs.patch diff --git a/patches/server/0755-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0754-fix-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0755-fix-entity-vehicle-collision-event-not-called.patch rename to patches/server/0754-fix-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0756-Add-EntityToggleSitEvent.patch b/patches/server/0755-Add-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0756-Add-EntityToggleSitEvent.patch rename to patches/server/0755-Add-EntityToggleSitEvent.patch diff --git a/patches/server/0757-Add-fire-tick-delay-option.patch b/patches/server/0756-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0757-Add-fire-tick-delay-option.patch rename to patches/server/0756-Add-fire-tick-delay-option.patch diff --git a/patches/server/0758-Add-Moving-Piston-API.patch b/patches/server/0757-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0758-Add-Moving-Piston-API.patch rename to patches/server/0757-Add-Moving-Piston-API.patch diff --git a/patches/server/0759-Ignore-impossible-spawn-tick.patch b/patches/server/0758-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0759-Ignore-impossible-spawn-tick.patch rename to patches/server/0758-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0760-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch b/patches/server/0759-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch similarity index 100% rename from patches/server/0760-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch rename to patches/server/0759-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch diff --git a/patches/server/0761-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0760-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0761-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0760-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0762-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0761-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0762-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0761-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0763-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0762-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0763-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0762-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0764-Add-Player-Warden-Warning-API.patch b/patches/server/0763-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0764-Add-Player-Warden-Warning-API.patch rename to patches/server/0763-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0765-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0764-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0765-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0764-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0766-Add-paper-dumplisteners-command.patch b/patches/server/0765-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0766-Add-paper-dumplisteners-command.patch rename to patches/server/0765-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0767-check-global-player-list-where-appropriate.patch b/patches/server/0766-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0767-check-global-player-list-where-appropriate.patch rename to patches/server/0766-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0768-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0767-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0768-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0767-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0769-ItemStack-damage-API.patch b/patches/server/0768-ItemStack-damage-API.patch similarity index 97% rename from patches/server/0769-ItemStack-damage-API.patch rename to patches/server/0768-ItemStack-damage-API.patch index 0faf3b2da5..1233d5fea9 100644 --- a/patches/server/0769-ItemStack-damage-API.patch +++ b/patches/server/0768-ItemStack-damage-API.patch @@ -53,10 +53,10 @@ index bee59df6a8f30416f94c1a4fbd5e2629336e842f..e64cc91b416bbbefe6aadf1c6b685346 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 8babdfe0c6bd921f95cf55313197d576035b0891..f1d2a1610649779da09a76ede7fdfa14658c82ba 100644 +index 2a7fffa71106327d0ffee632408d45faaec76702..2332f40fed84510741e63073aaf0a18aab85303e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1117,4 +1117,48 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1135,4 +1135,48 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { this.getHandle().knockback(strength, directionX, directionZ); }; // Paper end - knockback API diff --git a/patches/server/0770-Friction-API.patch b/patches/server/0769-Friction-API.patch similarity index 97% rename from patches/server/0770-Friction-API.patch rename to patches/server/0769-Friction-API.patch index e90915cb3e..dc735c46bb 100644 --- a/patches/server/0770-Friction-API.patch +++ b/patches/server/0769-Friction-API.patch @@ -133,10 +133,10 @@ index 1a291dd8a287db30e71dcb315599fc4b038764c4..30d62ee4d5cd2ddacb8783b5bbbf475d public int getHealth() { return this.getHandle().health; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index f1d2a1610649779da09a76ede7fdfa14658c82ba..7afa1fdc9e2cd517c8e173275b2882666e720bcf 100644 +index 2332f40fed84510741e63073aaf0a18aab85303e..516ea1ec9ae5069c3c0e4708f62164a91960b627 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1161,4 +1161,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1179,4 +1179,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { nmsStack.hurtAndBreak(amount, this.getHandle(), slot, true); } // Paper end - ItemStack damage API diff --git a/patches/server/0771-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0770-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0771-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0770-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0772-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0771-Fix-premature-player-kicks-on-shutdown.patch similarity index 100% rename from patches/server/0772-Fix-premature-player-kicks-on-shutdown.patch rename to patches/server/0771-Fix-premature-player-kicks-on-shutdown.patch diff --git a/patches/server/0773-Sync-offhand-slot-in-menus.patch b/patches/server/0772-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0773-Sync-offhand-slot-in-menus.patch rename to patches/server/0772-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0774-Player-Entity-Tracking-Events.patch b/patches/server/0773-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0774-Player-Entity-Tracking-Events.patch rename to patches/server/0773-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0775-Limit-pet-look-distance.patch b/patches/server/0774-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0775-Limit-pet-look-distance.patch rename to patches/server/0774-Limit-pet-look-distance.patch diff --git a/patches/server/0776-fix-Instruments.patch b/patches/server/0775-fix-Instruments.patch similarity index 100% rename from patches/server/0776-fix-Instruments.patch rename to patches/server/0775-fix-Instruments.patch diff --git a/patches/server/0777-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0776-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0777-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0776-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0778-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0777-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0778-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0777-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0779-Add-BlockLockCheckEvent.patch b/patches/server/0778-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0779-Add-BlockLockCheckEvent.patch rename to patches/server/0778-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0780-Add-Sneaking-API-for-Entities.patch b/patches/server/0779-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0780-Add-Sneaking-API-for-Entities.patch rename to patches/server/0779-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0781-Improve-logging-and-errors.patch b/patches/server/0780-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0781-Improve-logging-and-errors.patch rename to patches/server/0780-Improve-logging-and-errors.patch diff --git a/patches/server/0782-Improve-PortalEvents.patch b/patches/server/0781-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0782-Improve-PortalEvents.patch rename to patches/server/0781-Improve-PortalEvents.patch diff --git a/patches/server/0783-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0782-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0783-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0782-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0784-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0783-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0784-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0783-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0785-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0784-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0785-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0784-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0786-Flying-Fall-Damage.patch b/patches/server/0785-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0786-Flying-Fall-Damage.patch rename to patches/server/0785-Flying-Fall-Damage.patch diff --git a/patches/server/0787-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0786-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0787-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0786-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0788-config-for-disabling-entity-tag-tags.patch b/patches/server/0787-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0788-config-for-disabling-entity-tag-tags.patch rename to patches/server/0787-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0789-Use-single-player-info-update-packet-on-join.patch b/patches/server/0788-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0789-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0788-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0790-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0789-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0790-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0789-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0791-Win-Screen-API.patch b/patches/server/0790-Win-Screen-API.patch similarity index 100% rename from patches/server/0791-Win-Screen-API.patch rename to patches/server/0790-Win-Screen-API.patch diff --git a/patches/server/0792-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0791-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0792-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0791-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0793-Fix-force-opening-enchantment-tables.patch b/patches/server/0792-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0793-Fix-force-opening-enchantment-tables.patch rename to patches/server/0792-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0794-Add-Entity-Body-Yaw-API.patch b/patches/server/0793-Add-Entity-Body-Yaw-API.patch similarity index 92% rename from patches/server/0794-Add-Entity-Body-Yaw-API.patch rename to patches/server/0793-Add-Entity-Body-Yaw-API.patch index a4f9c0231a..c1be71053d 100644 --- a/patches/server/0794-Add-Entity-Body-Yaw-API.patch +++ b/patches/server/0793-Add-Entity-Body-Yaw-API.patch @@ -43,10 +43,10 @@ index ac513d3162a0794f226abc80bff21c799fe5802c..7c7501b4b21530d0641774f64e87d7d1 @Override public boolean isInvisible() { // Paper - moved up from LivingEntity diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 7afa1fdc9e2cd517c8e173275b2882666e720bcf..563da83fe7159aa5bc8e5387734ee502045b3f15 100644 +index 516ea1ec9ae5069c3c0e4708f62164a91960b627..a50803a9b41cf3c0b081eb6b786f952dd0ed284f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1174,4 +1174,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1192,4 +1192,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { this.getHandle().frictionState = state; } // Paper end - friction API diff --git a/patches/server/0795-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0794-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0795-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0794-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0796-Add-EntityFertilizeEggEvent.patch b/patches/server/0795-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0796-Add-EntityFertilizeEggEvent.patch rename to patches/server/0795-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0797-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0796-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0797-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0796-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0798-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0797-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0798-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0797-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0799-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0798-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0799-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0798-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0800-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0799-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0800-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0799-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0801-Fix-text-display-error-on-spawn.patch b/patches/server/0800-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0801-Fix-text-display-error-on-spawn.patch rename to patches/server/0800-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0802-Fix-inventories-returning-null-Locations.patch b/patches/server/0801-Fix-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0802-Fix-inventories-returning-null-Locations.patch rename to patches/server/0801-Fix-inventories-returning-null-Locations.patch diff --git a/patches/server/0803-Add-Shearable-API.patch b/patches/server/0802-Add-Shearable-API.patch similarity index 100% rename from patches/server/0803-Add-Shearable-API.patch rename to patches/server/0802-Add-Shearable-API.patch diff --git a/patches/server/0804-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0803-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0804-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0803-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0805-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0804-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0805-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0804-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0806-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0805-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0806-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0805-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0807-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0806-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0807-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0806-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0808-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0807-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0808-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0807-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0809-Use-array-for-gamerule-storage.patch b/patches/server/0808-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0809-Use-array-for-gamerule-storage.patch rename to patches/server/0808-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0810-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0809-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0810-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0809-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0811-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0810-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0811-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0810-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0812-Add-Mob-Experience-reward-API.patch b/patches/server/0811-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0812-Add-Mob-Experience-reward-API.patch rename to patches/server/0811-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0813-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0812-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0813-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0812-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0814-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0813-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0814-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0813-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0815-More-accurate-isInOpenWater-impl.patch b/patches/server/0814-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0815-More-accurate-isInOpenWater-impl.patch rename to patches/server/0814-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0816-Expand-PlayerItemMendEvent.patch b/patches/server/0815-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0816-Expand-PlayerItemMendEvent.patch rename to patches/server/0815-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0817-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0816-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0817-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0816-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0818-Add-transient-modifier-API.patch b/patches/server/0817-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0818-Add-transient-modifier-API.patch rename to patches/server/0817-Add-transient-modifier-API.patch diff --git a/patches/server/0819-Fix-block-place-logic.patch b/patches/server/0818-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0819-Fix-block-place-logic.patch rename to patches/server/0818-Fix-block-place-logic.patch diff --git a/patches/server/0820-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0819-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0820-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0819-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0821-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0820-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0821-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0820-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0822-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0821-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0822-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0821-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0823-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0822-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0823-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0822-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0824-Fix-sniffer-removeExploredLocation.patch b/patches/server/0823-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0824-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0823-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0825-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0824-Add-method-to-remove-all-active-potion-effects.patch similarity index 91% rename from patches/server/0825-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0824-Add-method-to-remove-all-active-potion-effects.patch index beee87ef9d..4e1ece1a04 100644 --- a/patches/server/0825-Add-method-to-remove-all-active-potion-effects.patch +++ b/patches/server/0824-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 a5d30e5657edd7d71ea521f81faa6d3088164291..6c44aaef8f09b2a10183dba751557ac5c6233a87 100644 +index a50803a9b41cf3c0b081eb6b786f952dd0ed284f..0398ba2cac2b69111ce7c5f9e5680119dd27c6cf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -563,6 +563,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0826-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0825-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0826-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0825-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0827-Add-event-for-player-editing-sign.patch b/patches/server/0826-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0827-Add-event-for-player-editing-sign.patch rename to patches/server/0826-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0828-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0827-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0828-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0827-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0829-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0828-Fix-cmd-permission-levels-for-command-blocks.patch similarity index 100% rename from patches/server/0829-Fix-cmd-permission-levels-for-command-blocks.patch rename to patches/server/0828-Fix-cmd-permission-levels-for-command-blocks.patch diff --git a/patches/server/0830-Add-option-to-disable-block-updates.patch b/patches/server/0829-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0830-Add-option-to-disable-block-updates.patch rename to patches/server/0829-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0831-Call-missing-BlockDispenseEvent.patch b/patches/server/0830-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0831-Call-missing-BlockDispenseEvent.patch rename to patches/server/0830-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0832-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0831-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 100% rename from patches/server/0832-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0831-Don-t-load-chunks-for-supporting-block-checks.patch diff --git a/patches/server/0833-Optimize-player-lookups-for-beacons.patch b/patches/server/0832-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0833-Optimize-player-lookups-for-beacons.patch rename to patches/server/0832-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0834-More-Sign-Block-API.patch b/patches/server/0833-More-Sign-Block-API.patch similarity index 100% rename from patches/server/0834-More-Sign-Block-API.patch rename to patches/server/0833-More-Sign-Block-API.patch diff --git a/patches/server/0835-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0834-fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/0835-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0834-fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/0836-Fix-BanList-API.patch b/patches/server/0835-Fix-BanList-API.patch similarity index 100% rename from patches/server/0836-Fix-BanList-API.patch rename to patches/server/0835-Fix-BanList-API.patch diff --git a/patches/server/0837-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0836-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0837-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0836-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0838-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0837-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0838-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0837-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0839-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0838-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0839-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0838-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0840-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0839-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/server/0840-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0839-ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/server/0841-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0840-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0841-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0840-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0842-Add-whitelist-events.patch b/patches/server/0841-Add-whitelist-events.patch similarity index 100% rename from patches/server/0842-Add-whitelist-events.patch rename to patches/server/0841-Add-whitelist-events.patch diff --git a/patches/server/0843-Implement-PlayerFailMoveEvent.patch b/patches/server/0842-Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/server/0843-Implement-PlayerFailMoveEvent.patch rename to patches/server/0842-Implement-PlayerFailMoveEvent.patch diff --git a/patches/server/0844-Folia-scheduler-and-owned-region-API.patch b/patches/server/0843-Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/server/0844-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0843-Folia-scheduler-and-owned-region-API.patch diff --git a/patches/server/0845-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0844-Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/server/0845-Only-erase-allay-memory-on-non-item-targets.patch rename to patches/server/0844-Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/server/0846-API-for-updating-recipes-on-clients.patch b/patches/server/0845-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/server/0846-API-for-updating-recipes-on-clients.patch rename to patches/server/0845-API-for-updating-recipes-on-clients.patch diff --git a/patches/server/0847-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0846-Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/server/0847-Fix-rotation-when-spawning-display-entities.patch rename to patches/server/0846-Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/server/0848-Only-capture-actual-tree-growth.patch b/patches/server/0847-Only-capture-actual-tree-growth.patch similarity index 100% rename from patches/server/0848-Only-capture-actual-tree-growth.patch rename to patches/server/0847-Only-capture-actual-tree-growth.patch diff --git a/patches/server/0849-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0848-Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/server/0849-Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/server/0848-Use-correct-source-for-mushroom-block-spread-event.patch diff --git a/patches/server/0850-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0849-Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/server/0850-Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/server/0849-Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/server/0851-Use-correct-seed-on-api-world-load.patch b/patches/server/0850-Use-correct-seed-on-api-world-load.patch similarity index 100% rename from patches/server/0851-Use-correct-seed-on-api-world-load.patch rename to patches/server/0850-Use-correct-seed-on-api-world-load.patch diff --git a/patches/server/0852-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0851-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0852-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/0851-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0853-Cache-map-ids-on-item-frames.patch b/patches/server/0852-Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/server/0853-Cache-map-ids-on-item-frames.patch rename to patches/server/0852-Cache-map-ids-on-item-frames.patch diff --git a/patches/server/0854-Fix-custom-statistic-criteria-creation.patch b/patches/server/0853-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/server/0854-Fix-custom-statistic-criteria-creation.patch rename to patches/server/0853-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/server/0855-Bandaid-fix-for-Effect.patch b/patches/server/0854-Bandaid-fix-for-Effect.patch similarity index 100% rename from patches/server/0855-Bandaid-fix-for-Effect.patch rename to patches/server/0854-Bandaid-fix-for-Effect.patch diff --git a/patches/server/0856-SculkCatalyst-bloom-API.patch b/patches/server/0855-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0856-SculkCatalyst-bloom-API.patch rename to patches/server/0855-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0857-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0856-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/server/0857-API-for-an-entity-s-scoreboard-name.patch rename to patches/server/0856-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/server/0858-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0857-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/server/0858-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/0857-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/server/0859-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0858-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/server/0859-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/0858-Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/server/0860-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0859-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/server/0860-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/0859-Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/server/0861-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0860-Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/server/0861-Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/0860-Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/server/0862-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0861-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/server/0862-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/0861-Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/server/0863-Add-Listing-API-for-Player.patch b/patches/server/0862-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/server/0863-Add-Listing-API-for-Player.patch rename to patches/server/0862-Add-Listing-API-for-Player.patch diff --git a/patches/server/0864-Configurable-Region-Compression-Format.patch b/patches/server/0863-Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/server/0864-Configurable-Region-Compression-Format.patch rename to patches/server/0863-Configurable-Region-Compression-Format.patch diff --git a/patches/server/0865-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0864-Add-BlockFace-to-BlockDamageEvent.patch similarity index 100% rename from patches/server/0865-Add-BlockFace-to-BlockDamageEvent.patch rename to patches/server/0864-Add-BlockFace-to-BlockDamageEvent.patch diff --git a/patches/server/0866-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0865-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/0866-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/0865-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/0867-Expand-Pose-API.patch b/patches/server/0866-Expand-Pose-API.patch similarity index 100% rename from patches/server/0867-Expand-Pose-API.patch rename to patches/server/0866-Expand-Pose-API.patch diff --git a/patches/server/0868-More-DragonBattle-API.patch b/patches/server/0867-More-DragonBattle-API.patch similarity index 100% rename from patches/server/0868-More-DragonBattle-API.patch rename to patches/server/0867-More-DragonBattle-API.patch diff --git a/patches/server/0869-Add-PlayerPickItemEvent.patch b/patches/server/0868-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/server/0869-Add-PlayerPickItemEvent.patch rename to patches/server/0868-Add-PlayerPickItemEvent.patch diff --git a/patches/server/0870-Allow-trident-custom-damage.patch b/patches/server/0869-Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/0870-Allow-trident-custom-damage.patch rename to patches/server/0869-Allow-trident-custom-damage.patch diff --git a/patches/server/0871-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0870-Expose-hand-in-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/0871-Expose-hand-in-BlockCanBuildEvent.patch rename to patches/server/0870-Expose-hand-in-BlockCanBuildEvent.patch diff --git a/patches/server/0872-Optimize-nearest-structure-border-iteration.patch b/patches/server/0871-Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/0872-Optimize-nearest-structure-border-iteration.patch rename to patches/server/0871-Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/0873-Implement-OfflinePlayer-isConnected.patch b/patches/server/0872-Implement-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/server/0873-Implement-OfflinePlayer-isConnected.patch rename to patches/server/0872-Implement-OfflinePlayer-isConnected.patch diff --git a/patches/server/0874-Fix-slot-desync.patch b/patches/server/0873-Fix-slot-desync.patch similarity index 100% rename from patches/server/0874-Fix-slot-desync.patch rename to patches/server/0873-Fix-slot-desync.patch diff --git a/patches/server/0875-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0874-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/server/0875-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/0874-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/server/0876-Configure-sniffer-egg-hatch-time.patch b/patches/server/0875-Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/0876-Configure-sniffer-egg-hatch-time.patch rename to patches/server/0875-Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/0877-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0876-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/server/0877-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/0876-Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/server/0878-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0877-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/0878-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/0877-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/0879-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0878-Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/server/0879-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/0878-Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/server/0880-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0879-Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/server/0880-Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/server/0879-Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/server/0881-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0880-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/server/0881-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/0880-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/server/0882-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0881-Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/server/0882-Fix-silent-equipment-change-for-mobs.patch rename to patches/server/0881-Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/server/0883-Fix-spigot-s-Forced-Stats.patch b/patches/server/0882-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/0883-Fix-spigot-s-Forced-Stats.patch rename to patches/server/0882-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/0884-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0883-Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/0884-Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/0883-Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/0885-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0884-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/server/0885-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/0884-Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/server/0886-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0885-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/0886-Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/0885-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/0887-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0886-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/server/0887-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/server/0886-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/server/0888-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0887-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/server/0888-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/server/0887-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/server/0889-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0888-Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 100% rename from patches/server/0889-Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/server/0888-Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/server/0890-Fix-missing-map-initialize-event-call.patch b/patches/server/0889-Fix-missing-map-initialize-event-call.patch similarity index 100% rename from patches/server/0890-Fix-missing-map-initialize-event-call.patch rename to patches/server/0889-Fix-missing-map-initialize-event-call.patch diff --git a/patches/server/0891-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0890-Update-entity-data-when-attaching-firework-to-entity.patch similarity index 100% rename from patches/server/0891-Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/server/0890-Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/server/0892-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0891-Fix-UnsafeValues-loadAdvancement.patch similarity index 100% rename from patches/server/0892-Fix-UnsafeValues-loadAdvancement.patch rename to patches/server/0891-Fix-UnsafeValues-loadAdvancement.patch diff --git a/patches/server/0893-Add-player-idle-duration-API.patch b/patches/server/0892-Add-player-idle-duration-API.patch similarity index 100% rename from patches/server/0893-Add-player-idle-duration-API.patch rename to patches/server/0892-Add-player-idle-duration-API.patch diff --git a/patches/server/0894-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0893-Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 100% rename from patches/server/0894-Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/server/0893-Don-t-check-if-we-can-see-non-visible-entities.patch diff --git a/patches/server/0895-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0894-Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/0895-Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/server/0894-Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/0896-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0895-Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 100% rename from patches/server/0896-Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/server/0895-Allow-null-itemstack-for-Player-sendEquipmentChange.patch diff --git a/patches/server/0897-Optimize-VarInts.patch b/patches/server/0896-Optimize-VarInts.patch similarity index 100% rename from patches/server/0897-Optimize-VarInts.patch rename to patches/server/0896-Optimize-VarInts.patch diff --git a/patches/server/0898-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0897-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/server/0898-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/server/0897-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/server/0899-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0898-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/server/0899-Add-predicate-for-blocks-when-raytracing.patch rename to patches/server/0898-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/server/0900-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0899-Broadcast-take-item-packets-with-collector-as-source.patch similarity index 100% rename from patches/server/0900-Broadcast-take-item-packets-with-collector-as-source.patch rename to patches/server/0899-Broadcast-take-item-packets-with-collector-as-source.patch diff --git a/patches/server/0901-Expand-LingeringPotion-API.patch b/patches/server/0900-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/server/0901-Expand-LingeringPotion-API.patch rename to patches/server/0900-Expand-LingeringPotion-API.patch diff --git a/patches/server/0902-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0901-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/server/0902-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/server/0901-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/server/0903-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0902-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/server/0903-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/server/0902-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/server/0904-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0903-Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/server/0904-Fix-several-issues-with-EntityBreedEvent.patch rename to patches/server/0903-Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/server/0905-Add-UUID-attribute-modifier-API.patch b/patches/server/0904-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/server/0905-Add-UUID-attribute-modifier-API.patch rename to patches/server/0904-Add-UUID-attribute-modifier-API.patch diff --git a/patches/server/0906-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0905-Fix-missing-event-call-for-entity-teleport-API.patch similarity index 100% rename from patches/server/0906-Fix-missing-event-call-for-entity-teleport-API.patch rename to patches/server/0905-Fix-missing-event-call-for-entity-teleport-API.patch diff --git a/patches/server/0907-Lazily-create-LootContext-for-criterions.patch b/patches/server/0906-Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/server/0907-Lazily-create-LootContext-for-criterions.patch rename to patches/server/0906-Lazily-create-LootContext-for-criterions.patch diff --git a/patches/server/0908-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0907-Don-t-fire-sync-events-during-worldgen.patch similarity index 100% rename from patches/server/0908-Don-t-fire-sync-events-during-worldgen.patch rename to patches/server/0907-Don-t-fire-sync-events-during-worldgen.patch diff --git a/patches/server/0909-Add-Structure-check-API.patch b/patches/server/0908-Add-Structure-check-API.patch similarity index 100% rename from patches/server/0909-Add-Structure-check-API.patch rename to patches/server/0908-Add-Structure-check-API.patch diff --git a/patches/server/0910-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0909-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 100% rename from patches/server/0910-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/server/0909-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch diff --git a/patches/server/0911-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0910-Restore-vanilla-entity-drops-behavior.patch similarity index 100% rename from patches/server/0911-Restore-vanilla-entity-drops-behavior.patch rename to patches/server/0910-Restore-vanilla-entity-drops-behavior.patch diff --git a/patches/server/0912-Dont-resend-blocks-on-interactions.patch b/patches/server/0911-Dont-resend-blocks-on-interactions.patch similarity index 100% rename from patches/server/0912-Dont-resend-blocks-on-interactions.patch rename to patches/server/0911-Dont-resend-blocks-on-interactions.patch diff --git a/patches/server/0913-add-more-scoreboard-API.patch b/patches/server/0912-add-more-scoreboard-API.patch similarity index 100% rename from patches/server/0913-add-more-scoreboard-API.patch rename to patches/server/0912-add-more-scoreboard-API.patch diff --git a/patches/server/0914-Improve-Registry.patch b/patches/server/0913-Improve-Registry.patch similarity index 100% rename from patches/server/0914-Improve-Registry.patch rename to patches/server/0913-Improve-Registry.patch diff --git a/patches/server/0915-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0914-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch similarity index 100% rename from patches/server/0915-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch rename to patches/server/0914-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch diff --git a/patches/server/0916-Add-experience-points-API.patch b/patches/server/0915-Add-experience-points-API.patch similarity index 100% rename from patches/server/0916-Add-experience-points-API.patch rename to patches/server/0915-Add-experience-points-API.patch diff --git a/patches/server/0917-Add-drops-to-shear-events.patch b/patches/server/0916-Add-drops-to-shear-events.patch similarity index 100% rename from patches/server/0917-Add-drops-to-shear-events.patch rename to patches/server/0916-Add-drops-to-shear-events.patch diff --git a/patches/server/0918-Add-PlayerShieldDisableEvent.patch b/patches/server/0917-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/server/0918-Add-PlayerShieldDisableEvent.patch rename to patches/server/0917-Add-PlayerShieldDisableEvent.patch diff --git a/patches/server/0919-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0918-Validate-ResourceLocation-in-NBT-reading.patch similarity index 100% rename from patches/server/0919-Validate-ResourceLocation-in-NBT-reading.patch rename to patches/server/0918-Validate-ResourceLocation-in-NBT-reading.patch diff --git a/patches/server/0920-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0919-Properly-handle-experience-dropping-on-block-break.patch similarity index 100% rename from patches/server/0920-Properly-handle-experience-dropping-on-block-break.patch rename to patches/server/0919-Properly-handle-experience-dropping-on-block-break.patch diff --git a/patches/server/0921-Fixup-NamespacedKey-handling.patch b/patches/server/0920-Fixup-NamespacedKey-handling.patch similarity index 100% rename from patches/server/0921-Fixup-NamespacedKey-handling.patch rename to patches/server/0920-Fixup-NamespacedKey-handling.patch diff --git a/patches/server/0922-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0921-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/server/0922-Expose-LootTable-of-DecoratedPot.patch rename to patches/server/0921-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/server/0923-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0922-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0923-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0922-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0924-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0923-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0924-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0923-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0925-Add-ShulkerDuplicateEvent.patch b/patches/server/0924-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/server/0925-Add-ShulkerDuplicateEvent.patch rename to patches/server/0924-Add-ShulkerDuplicateEvent.patch diff --git a/patches/server/0926-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0925-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/server/0926-Add-api-for-spawn-egg-texture-colors.patch rename to patches/server/0925-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/server/0927-Add-Lifecycle-Event-system.patch b/patches/server/0926-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/server/0927-Add-Lifecycle-Event-system.patch rename to patches/server/0926-Add-Lifecycle-Event-system.patch diff --git a/patches/server/0928-ItemStack-Tooltip-API.patch b/patches/server/0927-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/server/0928-ItemStack-Tooltip-API.patch rename to patches/server/0927-ItemStack-Tooltip-API.patch diff --git a/patches/server/0929-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0928-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/server/0929-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/server/0928-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/server/0930-Add-FluidState-API.patch b/patches/server/0929-Add-FluidState-API.patch similarity index 100% rename from patches/server/0930-Add-FluidState-API.patch rename to patches/server/0929-Add-FluidState-API.patch diff --git a/patches/server/0931-add-number-format-api.patch b/patches/server/0930-add-number-format-api.patch similarity index 100% rename from patches/server/0931-add-number-format-api.patch rename to patches/server/0930-add-number-format-api.patch diff --git a/patches/server/0932-improve-BanList-types.patch b/patches/server/0931-improve-BanList-types.patch similarity index 100% rename from patches/server/0932-improve-BanList-types.patch rename to patches/server/0931-improve-BanList-types.patch diff --git a/patches/server/0933-Expanded-Hopper-API.patch b/patches/server/0932-Expanded-Hopper-API.patch similarity index 100% rename from patches/server/0933-Expanded-Hopper-API.patch rename to patches/server/0932-Expanded-Hopper-API.patch diff --git a/patches/server/0934-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0933-Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/server/0934-Add-BlockBreakProgressUpdateEvent.patch rename to patches/server/0933-Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/server/0935-Deprecate-ItemStack-setType.patch b/patches/server/0934-Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/server/0935-Deprecate-ItemStack-setType.patch rename to patches/server/0934-Deprecate-ItemStack-setType.patch diff --git a/patches/server/0936-Add-CartographyItemEvent.patch b/patches/server/0935-Add-CartographyItemEvent.patch similarity index 100% rename from patches/server/0936-Add-CartographyItemEvent.patch rename to patches/server/0935-Add-CartographyItemEvent.patch diff --git a/patches/server/0937-More-Raid-API.patch b/patches/server/0936-More-Raid-API.patch similarity index 100% rename from patches/server/0937-More-Raid-API.patch rename to patches/server/0936-More-Raid-API.patch diff --git a/patches/server/0938-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0937-Add-onboarding-message-for-initial-server-start.patch similarity index 100% rename from patches/server/0938-Add-onboarding-message-for-initial-server-start.patch rename to patches/server/0937-Add-onboarding-message-for-initial-server-start.patch diff --git a/patches/server/0939-Configurable-max-block-fluid-ticks.patch b/patches/server/0938-Configurable-max-block-fluid-ticks.patch similarity index 100% rename from patches/server/0939-Configurable-max-block-fluid-ticks.patch rename to patches/server/0938-Configurable-max-block-fluid-ticks.patch diff --git a/patches/server/0940-Fix-bees-aging-inside-hives.patch b/patches/server/0939-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0940-Fix-bees-aging-inside-hives.patch rename to patches/server/0939-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0941-Disable-memory-reserve-allocating.patch b/patches/server/0940-Disable-memory-reserve-allocating.patch similarity index 100% rename from patches/server/0941-Disable-memory-reserve-allocating.patch rename to patches/server/0940-Disable-memory-reserve-allocating.patch diff --git a/patches/server/0942-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0941-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch similarity index 100% rename from patches/server/0942-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch rename to patches/server/0941-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch diff --git a/patches/server/0943-Fix-DamageSource-API.patch b/patches/server/0942-Fix-DamageSource-API.patch similarity index 100% rename from patches/server/0943-Fix-DamageSource-API.patch rename to patches/server/0942-Fix-DamageSource-API.patch diff --git a/patches/server/0944-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0943-Fix-creation-of-invalid-block-entity-during-world-ge.patch similarity index 100% rename from patches/server/0944-Fix-creation-of-invalid-block-entity-during-world-ge.patch rename to patches/server/0943-Fix-creation-of-invalid-block-entity-during-world-ge.patch diff --git a/patches/server/0945-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0944-Fix-possible-StackOverflowError-for-some-dispenses.patch similarity index 100% rename from patches/server/0945-Fix-possible-StackOverflowError-for-some-dispenses.patch rename to patches/server/0944-Fix-possible-StackOverflowError-for-some-dispenses.patch diff --git a/patches/server/0946-Improve-tag-parser-handling.patch b/patches/server/0945-Improve-tag-parser-handling.patch similarity index 100% rename from patches/server/0946-Improve-tag-parser-handling.patch rename to patches/server/0945-Improve-tag-parser-handling.patch diff --git a/patches/server/0947-Item-Mutation-Fixes.patch b/patches/server/0946-Item-Mutation-Fixes.patch similarity index 100% rename from patches/server/0947-Item-Mutation-Fixes.patch rename to patches/server/0946-Item-Mutation-Fixes.patch diff --git a/patches/server/0948-Per-world-ticks-per-spawn-settings.patch b/patches/server/0947-Per-world-ticks-per-spawn-settings.patch similarity index 100% rename from patches/server/0948-Per-world-ticks-per-spawn-settings.patch rename to patches/server/0947-Per-world-ticks-per-spawn-settings.patch diff --git a/patches/server/0949-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0948-Properly-track-the-changed-item-from-dispense-events.patch similarity index 100% rename from patches/server/0949-Properly-track-the-changed-item-from-dispense-events.patch rename to patches/server/0948-Properly-track-the-changed-item-from-dispense-events.patch diff --git a/patches/server/0950-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0949-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0950-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0949-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0951-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/0950-Fix-tripwire-disarming-not-working-as-intended.patch similarity index 100% rename from patches/server/0951-Fix-tripwire-disarming-not-working-as-intended.patch rename to patches/server/0950-Fix-tripwire-disarming-not-working-as-intended.patch diff --git a/patches/server/0952-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0951-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0952-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0951-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0953-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/0952-Deep-clone-nbt-tags-in-PDC.patch similarity index 100% rename from patches/server/0953-Deep-clone-nbt-tags-in-PDC.patch rename to patches/server/0952-Deep-clone-nbt-tags-in-PDC.patch diff --git a/patches/server/0954-Support-old-UUID-format-for-NBT.patch b/patches/server/0953-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0954-Support-old-UUID-format-for-NBT.patch rename to patches/server/0953-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0955-Fix-shield-disable-inconsistency.patch b/patches/server/0954-Fix-shield-disable-inconsistency.patch similarity index 100% rename from patches/server/0955-Fix-shield-disable-inconsistency.patch rename to patches/server/0954-Fix-shield-disable-inconsistency.patch diff --git a/patches/server/0956-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0955-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0956-Handle-Large-Packets-disconnecting-client.patch rename to patches/server/0955-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/0957-Fix-ItemFlags.patch b/patches/server/0956-Fix-ItemFlags.patch similarity index 100% rename from patches/server/0957-Fix-ItemFlags.patch rename to patches/server/0956-Fix-ItemFlags.patch diff --git a/patches/server/0958-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0957-Fix-helmet-damage-reduction-inconsistencies.patch similarity index 100% rename from patches/server/0958-Fix-helmet-damage-reduction-inconsistencies.patch rename to patches/server/0957-Fix-helmet-damage-reduction-inconsistencies.patch diff --git a/patches/server/0959-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0958-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch similarity index 100% rename from patches/server/0959-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch rename to patches/server/0958-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch diff --git a/patches/server/0960-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/0959-improve-checking-handled-tags-in-itemmeta.patch similarity index 100% rename from patches/server/0960-improve-checking-handled-tags-in-itemmeta.patch rename to patches/server/0959-improve-checking-handled-tags-in-itemmeta.patch diff --git a/patches/server/0961-General-ItemMeta-fixes.patch b/patches/server/0960-General-ItemMeta-fixes.patch similarity index 100% rename from patches/server/0961-General-ItemMeta-fixes.patch rename to patches/server/0960-General-ItemMeta-fixes.patch diff --git a/patches/server/0962-Expose-hasColor-to-leather-armor.patch b/patches/server/0961-Expose-hasColor-to-leather-armor.patch similarity index 100% rename from patches/server/0962-Expose-hasColor-to-leather-armor.patch rename to patches/server/0961-Expose-hasColor-to-leather-armor.patch diff --git a/patches/server/0963-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0962-Added-API-to-get-player-ha-proxy-address.patch similarity index 100% rename from patches/server/0963-Added-API-to-get-player-ha-proxy-address.patch rename to patches/server/0962-Added-API-to-get-player-ha-proxy-address.patch diff --git a/patches/server/0964-More-Chest-Block-API.patch b/patches/server/0963-More-Chest-Block-API.patch similarity index 100% rename from patches/server/0964-More-Chest-Block-API.patch rename to patches/server/0963-More-Chest-Block-API.patch diff --git a/patches/server/0965-Print-data-component-type-on-encoding-error.patch b/patches/server/0964-Print-data-component-type-on-encoding-error.patch similarity index 100% rename from patches/server/0965-Print-data-component-type-on-encoding-error.patch rename to patches/server/0964-Print-data-component-type-on-encoding-error.patch diff --git a/patches/server/0966-Brigadier-based-command-API.patch b/patches/server/0965-Brigadier-based-command-API.patch similarity index 100% rename from patches/server/0966-Brigadier-based-command-API.patch rename to patches/server/0965-Brigadier-based-command-API.patch diff --git a/patches/server/0967-Fix-issues-with-Recipe-API.patch b/patches/server/0966-Fix-issues-with-Recipe-API.patch similarity index 100% rename from patches/server/0967-Fix-issues-with-Recipe-API.patch rename to patches/server/0966-Fix-issues-with-Recipe-API.patch diff --git a/patches/server/0968-Fix-equipment-slot-and-group-API.patch b/patches/server/0967-Fix-equipment-slot-and-group-API.patch similarity index 97% rename from patches/server/0968-Fix-equipment-slot-and-group-API.patch rename to patches/server/0967-Fix-equipment-slot-and-group-API.patch index 017d4a02be..34fd77dcd9 100644 --- a/patches/server/0968-Fix-equipment-slot-and-group-API.patch +++ b/patches/server/0967-Fix-equipment-slot-and-group-API.patch @@ -10,10 +10,10 @@ Adds the following: Co-authored-by: SoSeDiK diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index d3bbf5dea0d26603f76293ebf64a86366f5ad3a1..d759a2adc77e35d66a1ff1c9f227cded6f0e9963 100644 +index 0398ba2cac2b69111ce7c5f9e5680119dd27c6cf..7e280955067169f63f15162e9cad1e86e824a8e5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1193,4 +1193,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1211,4 +1211,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { this.getHandle().setYBodyRot(bodyYaw); } // Paper end - body yaw API diff --git a/patches/server/0969-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/0968-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch similarity index 100% rename from patches/server/0969-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch rename to patches/server/0968-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch diff --git a/patches/server/0970-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0969-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0970-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0969-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0971-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/0970-Prevent-NPE-if-hooked-entity-was-cleared.patch similarity index 100% rename from patches/server/0971-Prevent-NPE-if-hooked-entity-was-cleared.patch rename to patches/server/0970-Prevent-NPE-if-hooked-entity-was-cleared.patch diff --git a/patches/server/0972-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/0971-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch similarity index 100% rename from patches/server/0972-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch rename to patches/server/0971-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch diff --git a/patches/server/0973-Add-missing-fishing-event-state.patch b/patches/server/0972-Add-missing-fishing-event-state.patch similarity index 100% rename from patches/server/0973-Add-missing-fishing-event-state.patch rename to patches/server/0972-Add-missing-fishing-event-state.patch diff --git a/patches/server/0974-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0973-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch similarity index 100% rename from patches/server/0974-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch rename to patches/server/0973-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch diff --git a/patches/server/0975-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/0974-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch similarity index 100% rename from patches/server/0975-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch rename to patches/server/0974-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch diff --git a/patches/server/0976-Adopt-MaterialRerouting.patch b/patches/server/0975-Adopt-MaterialRerouting.patch similarity index 100% rename from patches/server/0976-Adopt-MaterialRerouting.patch rename to patches/server/0975-Adopt-MaterialRerouting.patch diff --git a/patches/server/0977-Suspicious-Effect-Entry-API.patch b/patches/server/0976-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/server/0977-Suspicious-Effect-Entry-API.patch rename to patches/server/0976-Suspicious-Effect-Entry-API.patch diff --git a/patches/server/0978-check-if-itemstack-is-stackable-first.patch b/patches/server/0977-check-if-itemstack-is-stackable-first.patch similarity index 100% rename from patches/server/0978-check-if-itemstack-is-stackable-first.patch rename to patches/server/0977-check-if-itemstack-is-stackable-first.patch diff --git a/patches/server/0979-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0978-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0979-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0978-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0980-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0979-Configurable-damage-tick-when-blocking-with-shield.patch similarity index 100% rename from patches/server/0980-Configurable-damage-tick-when-blocking-with-shield.patch rename to patches/server/0979-Configurable-damage-tick-when-blocking-with-shield.patch diff --git a/patches/server/0981-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0980-Properly-remove-the-experimental-smithing-inventory-.patch similarity index 100% rename from patches/server/0981-Properly-remove-the-experimental-smithing-inventory-.patch rename to patches/server/0980-Properly-remove-the-experimental-smithing-inventory-.patch diff --git a/patches/server/0982-Moonrise-optimisation-patches.patch b/patches/server/0981-Moonrise-optimisation-patches.patch similarity index 100% rename from patches/server/0982-Moonrise-optimisation-patches.patch rename to patches/server/0981-Moonrise-optimisation-patches.patch diff --git a/patches/server/0983-Rewrite-dataconverter-system.patch b/patches/server/0982-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0983-Rewrite-dataconverter-system.patch rename to patches/server/0982-Rewrite-dataconverter-system.patch diff --git a/patches/server/0984-disable-forced-empty-world-ticks.patch b/patches/server/0983-disable-forced-empty-world-ticks.patch similarity index 100% rename from patches/server/0984-disable-forced-empty-world-ticks.patch rename to patches/server/0983-disable-forced-empty-world-ticks.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-Flat-bedrock-generator-settings.patch b/patches/server/0989-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0990-Flat-bedrock-generator-settings.patch rename to patches/server/0989-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0991-Entity-Activation-Range-2.0.patch b/patches/server/0990-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0991-Entity-Activation-Range-2.0.patch rename to patches/server/0990-Entity-Activation-Range-2.0.patch diff --git a/patches/server/0992-Optional-per-player-mob-spawns.patch b/patches/server/0991-Optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0992-Optional-per-player-mob-spawns.patch rename to patches/server/0991-Optional-per-player-mob-spawns.patch diff --git a/patches/server/0993-Anti-Xray.patch b/patches/server/0992-Anti-Xray.patch similarity index 100% rename from patches/server/0993-Anti-Xray.patch rename to patches/server/0992-Anti-Xray.patch diff --git a/patches/server/0994-Eigencraft-redstone-implementation.patch b/patches/server/0993-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0994-Eigencraft-redstone-implementation.patch rename to patches/server/0993-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0995-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0994-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0995-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0994-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 100% rename from patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch diff --git a/patches/server/0997-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0996-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0997-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0996-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0998-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0997-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0998-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0997-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/1000-Optimize-Hoppers.patch b/patches/server/0999-Optimize-Hoppers.patch similarity index 100% rename from patches/server/1000-Optimize-Hoppers.patch rename to patches/server/0999-Optimize-Hoppers.patch diff --git a/patches/server/1001-Entity-load-save-limit-per-chunk.patch b/patches/server/1000-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/1001-Entity-load-save-limit-per-chunk.patch rename to patches/server/1000-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/1002-Optimize-Voxel-Shape-Merging.patch b/patches/server/1001-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/1002-Optimize-Voxel-Shape-Merging.patch rename to patches/server/1001-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/1003-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1002-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/1003-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/1002-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/1004-Remove-streams-from-hot-code.patch b/patches/server/1003-Remove-streams-from-hot-code.patch similarity index 100% rename from patches/server/1004-Remove-streams-from-hot-code.patch rename to patches/server/1003-Remove-streams-from-hot-code.patch diff --git a/patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1004-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/1004-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/1006-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1005-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/1006-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/1005-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/1007-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1006-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/1007-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/1006-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/1008-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1007-Handle-Oversized-block-entities-in-chunks.patch similarity index 100% rename from patches/server/1008-Handle-Oversized-block-entities-in-chunks.patch rename to patches/server/1007-Handle-Oversized-block-entities-in-chunks.patch diff --git a/patches/server/1009-API-for-checking-sent-chunks.patch b/patches/server/1008-API-for-checking-sent-chunks.patch similarity index 100% rename from patches/server/1009-API-for-checking-sent-chunks.patch rename to patches/server/1008-API-for-checking-sent-chunks.patch diff --git a/patches/server/1010-Check-distance-in-entity-interactions.patch b/patches/server/1009-Check-distance-in-entity-interactions.patch similarity index 100% rename from patches/server/1010-Check-distance-in-entity-interactions.patch rename to patches/server/1009-Check-distance-in-entity-interactions.patch diff --git a/patches/server/1011-Configurable-Sand-Duping.patch b/patches/server/1010-Configurable-Sand-Duping.patch similarity index 100% rename from patches/server/1011-Configurable-Sand-Duping.patch rename to patches/server/1010-Configurable-Sand-Duping.patch diff --git a/patches/server/1012-Optimise-general-POI-access.patch b/patches/server/1011-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/1012-Optimise-general-POI-access.patch rename to patches/server/1011-Optimise-general-POI-access.patch diff --git a/patches/server/1013-Improve-performance-of-mass-crafts.patch b/patches/server/1012-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1013-Improve-performance-of-mass-crafts.patch rename to patches/server/1012-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1014-Properly-resend-entities.patch b/patches/server/1013-Properly-resend-entities.patch similarity index 100% rename from patches/server/1014-Properly-resend-entities.patch rename to patches/server/1013-Properly-resend-entities.patch diff --git a/patches/server/1015-Registry-Modification-API.patch b/patches/server/1014-Registry-Modification-API.patch similarity index 100% rename from patches/server/1015-Registry-Modification-API.patch rename to patches/server/1014-Registry-Modification-API.patch diff --git a/patches/server/1016-Add-registry-entry-and-builders.patch b/patches/server/1015-Add-registry-entry-and-builders.patch similarity index 100% rename from patches/server/1016-Add-registry-entry-and-builders.patch rename to patches/server/1015-Add-registry-entry-and-builders.patch diff --git a/patches/server/1017-Improved-Watchdog-Support.patch b/patches/server/1016-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/1017-Improved-Watchdog-Support.patch rename to patches/server/1016-Improved-Watchdog-Support.patch diff --git a/patches/server/1018-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/1017-Proxy-ItemStack-to-CraftItemStack.patch similarity index 100% rename from patches/server/1018-Proxy-ItemStack-to-CraftItemStack.patch rename to patches/server/1017-Proxy-ItemStack-to-CraftItemStack.patch diff --git a/patches/server/1019-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/server/1018-Make-a-PDC-view-accessible-directly-from-ItemStack.patch similarity index 100% rename from patches/server/1019-Make-a-PDC-view-accessible-directly-from-ItemStack.patch rename to patches/server/1018-Make-a-PDC-view-accessible-directly-from-ItemStack.patch diff --git a/patches/server/1020-Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/server/1019-Prioritize-Minecraft-commands-in-function-parsing-an.patch similarity index 100% rename from patches/server/1020-Prioritize-Minecraft-commands-in-function-parsing-an.patch rename to patches/server/1019-Prioritize-Minecraft-commands-in-function-parsing-an.patch diff --git a/patches/server/1021-optimize-dirt-and-snow-spreading.patch b/patches/server/1020-optimize-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/1021-optimize-dirt-and-snow-spreading.patch rename to patches/server/1020-optimize-dirt-and-snow-spreading.patch diff --git a/patches/server/1022-Fix-NPE-for-Jukebox-setRecord.patch b/patches/server/1021-Fix-NPE-for-Jukebox-setRecord.patch similarity index 100% rename from patches/server/1022-Fix-NPE-for-Jukebox-setRecord.patch rename to patches/server/1021-Fix-NPE-for-Jukebox-setRecord.patch diff --git a/patches/server/1023-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1022-Fix-CraftWorld-isChunkGenerated.patch similarity index 100% rename from patches/server/1023-Fix-CraftWorld-isChunkGenerated.patch rename to patches/server/1022-Fix-CraftWorld-isChunkGenerated.patch diff --git a/patches/server/1024-fix-horse-inventories.patch b/patches/server/1023-fix-horse-inventories.patch similarity index 100% rename from patches/server/1024-fix-horse-inventories.patch rename to patches/server/1023-fix-horse-inventories.patch diff --git a/patches/server/1025-Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/server/1024-Only-call-EntityDamageEvents-before-actuallyHurt.patch similarity index 100% rename from patches/server/1025-Only-call-EntityDamageEvents-before-actuallyHurt.patch rename to patches/server/1024-Only-call-EntityDamageEvents-before-actuallyHurt.patch diff --git a/patches/server/1026-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1025-Fix-entity-tracker-desync-when-new-players-are-added.patch similarity index 100% rename from patches/server/1026-Fix-entity-tracker-desync-when-new-players-are-added.patch rename to patches/server/1025-Fix-entity-tracker-desync-when-new-players-are-added.patch diff --git a/patches/server/1027-Lag-compensation-ticks.patch b/patches/server/1026-Lag-compensation-ticks.patch similarity index 100% rename from patches/server/1027-Lag-compensation-ticks.patch rename to patches/server/1026-Lag-compensation-ticks.patch diff --git a/patches/server/1028-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1027-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/1028-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/1027-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/1029-Write-SavedData-IO-async.patch b/patches/server/1028-Write-SavedData-IO-async.patch similarity index 100% rename from patches/server/1029-Write-SavedData-IO-async.patch rename to patches/server/1028-Write-SavedData-IO-async.patch diff --git a/patches/server/1030-Add-ItemType-getItemRarity.patch b/patches/server/1029-Add-ItemType-getItemRarity.patch similarity index 100% rename from patches/server/1030-Add-ItemType-getItemRarity.patch rename to patches/server/1029-Add-ItemType-getItemRarity.patch diff --git a/patches/server/1031-Incremental-chunk-and-player-saving.patch b/patches/server/1030-Incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/1031-Incremental-chunk-and-player-saving.patch rename to patches/server/1030-Incremental-chunk-and-player-saving.patch diff --git a/patches/server/1032-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1031-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/1032-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/1031-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/1033-Bundle-spark.patch b/patches/server/1032-Bundle-spark.patch similarity index 100% rename from patches/server/1033-Bundle-spark.patch rename to patches/server/1032-Bundle-spark.patch diff --git a/patches/server/1034-Add-plugin-info-at-startup.patch b/patches/server/1033-Add-plugin-info-at-startup.patch similarity index 100% rename from patches/server/1034-Add-plugin-info-at-startup.patch rename to patches/server/1033-Add-plugin-info-at-startup.patch diff --git a/patches/server/1035-Make-interaction-leniency-distance-configurable.patch b/patches/server/1034-Make-interaction-leniency-distance-configurable.patch similarity index 100% rename from patches/server/1035-Make-interaction-leniency-distance-configurable.patch rename to patches/server/1034-Make-interaction-leniency-distance-configurable.patch diff --git a/patches/server/1036-Fix-PickupStatus-getting-reset.patch b/patches/server/1035-Fix-PickupStatus-getting-reset.patch similarity index 100% rename from patches/server/1036-Fix-PickupStatus-getting-reset.patch rename to patches/server/1035-Fix-PickupStatus-getting-reset.patch diff --git a/patches/server/1037-Check-for-block-type-in-SculkSensorBlock-canActivate.patch b/patches/server/1036-Check-for-block-type-in-SculkSensorBlock-canActivate.patch similarity index 100% rename from patches/server/1037-Check-for-block-type-in-SculkSensorBlock-canActivate.patch rename to patches/server/1036-Check-for-block-type-in-SculkSensorBlock-canActivate.patch diff --git a/patches/server/1038-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/server/1037-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch similarity index 100% rename from patches/server/1038-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch rename to patches/server/1037-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch diff --git a/patches/server/1039-Configuration-for-horizontal-only-item-merging.patch b/patches/server/1038-Configuration-for-horizontal-only-item-merging.patch similarity index 100% rename from patches/server/1039-Configuration-for-horizontal-only-item-merging.patch rename to patches/server/1038-Configuration-for-horizontal-only-item-merging.patch diff --git a/patches/server/1040-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1039-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/1040-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/1039-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/1041-Add-skipping-world-symlink-scan.patch b/patches/server/1040-Add-skipping-world-symlink-scan.patch similarity index 100% rename from patches/server/1041-Add-skipping-world-symlink-scan.patch rename to patches/server/1040-Add-skipping-world-symlink-scan.patch diff --git a/patches/server/1042-Add-even-more-Enchantment-API.patch b/patches/server/1041-Add-even-more-Enchantment-API.patch similarity index 100% rename from patches/server/1042-Add-even-more-Enchantment-API.patch rename to patches/server/1041-Add-even-more-Enchantment-API.patch diff --git a/patches/server/1043-Leashable-API.patch b/patches/server/1042-Leashable-API.patch similarity index 97% rename from patches/server/1043-Leashable-API.patch rename to patches/server/1042-Leashable-API.patch index d058d2f2da..0450da40fd 100644 --- a/patches/server/1043-Leashable-API.patch +++ b/patches/server/1042-Leashable-API.patch @@ -74,10 +74,10 @@ index e33b1b6fd50a4eea57500cc00dba20d6edcab75d..01a9660de65688b7c1a4f9dafcb65077 public CraftBoat(CraftServer server, net.minecraft.world.entity.vehicle.Boat entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index d759a2adc77e35d66a1ff1c9f227cded6f0e9963..6fc0d13a308b70e78bf0e24a3d33f90f5bac97ff 100644 +index 7e280955067169f63f15162e9cad1e86e824a8e5..4750df7354ccb5afd0910efe0415f3a2eb19a546 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -759,43 +759,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -777,43 +777,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @Override public boolean isLeashed() { diff --git a/patches/server/1044-Fix-CraftBukkit-drag-system.patch b/patches/server/1043-Fix-CraftBukkit-drag-system.patch similarity index 100% rename from patches/server/1044-Fix-CraftBukkit-drag-system.patch rename to patches/server/1043-Fix-CraftBukkit-drag-system.patch diff --git a/patches/server/1045-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch b/patches/server/1044-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch similarity index 100% rename from patches/server/1045-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch rename to patches/server/1044-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch diff --git a/patches/server/1046-Remove-set-damage-lootable-item-function-from-compas.patch b/patches/server/1045-Remove-set-damage-lootable-item-function-from-compas.patch similarity index 100% rename from patches/server/1046-Remove-set-damage-lootable-item-function-from-compas.patch rename to patches/server/1045-Remove-set-damage-lootable-item-function-from-compas.patch diff --git a/patches/server/1047-Properly-destroy-placed-blocks-on-the-end-platform.patch b/patches/server/1046-Properly-destroy-placed-blocks-on-the-end-platform.patch similarity index 100% rename from patches/server/1047-Properly-destroy-placed-blocks-on-the-end-platform.patch rename to patches/server/1046-Properly-destroy-placed-blocks-on-the-end-platform.patch diff --git a/patches/server/1048-Add-enchantment-seed-update-API.patch b/patches/server/1047-Add-enchantment-seed-update-API.patch similarity index 100% rename from patches/server/1048-Add-enchantment-seed-update-API.patch rename to patches/server/1047-Add-enchantment-seed-update-API.patch diff --git a/patches/server/1049-Fix-synchronise-sending-chat-to-client-with-updating.patch b/patches/server/1048-Fix-synchronise-sending-chat-to-client-with-updating.patch similarity index 100% rename from patches/server/1049-Fix-synchronise-sending-chat-to-client-with-updating.patch rename to patches/server/1048-Fix-synchronise-sending-chat-to-client-with-updating.patch diff --git a/patches/server/1050-Fix-InventoryOpenEvent-cancellation.patch b/patches/server/1049-Fix-InventoryOpenEvent-cancellation.patch similarity index 100% rename from patches/server/1050-Fix-InventoryOpenEvent-cancellation.patch rename to patches/server/1049-Fix-InventoryOpenEvent-cancellation.patch diff --git a/patches/server/1051-Fire-BlockExpEvent-on-grindstone-use.patch b/patches/server/1050-Fire-BlockExpEvent-on-grindstone-use.patch similarity index 100% rename from patches/server/1051-Fire-BlockExpEvent-on-grindstone-use.patch rename to patches/server/1050-Fire-BlockExpEvent-on-grindstone-use.patch diff --git a/patches/server/1052-Check-dead-flag-in-isAlive.patch b/patches/server/1051-Check-dead-flag-in-isAlive.patch similarity index 100% rename from patches/server/1052-Check-dead-flag-in-isAlive.patch rename to patches/server/1051-Check-dead-flag-in-isAlive.patch diff --git a/patches/server/1053-Add-FeatureFlag-API.patch b/patches/server/1052-Add-FeatureFlag-API.patch similarity index 100% rename from patches/server/1053-Add-FeatureFlag-API.patch rename to patches/server/1052-Add-FeatureFlag-API.patch diff --git a/patches/server/1054-Tag-Lifecycle-Events.patch b/patches/server/1053-Tag-Lifecycle-Events.patch similarity index 100% rename from patches/server/1054-Tag-Lifecycle-Events.patch rename to patches/server/1053-Tag-Lifecycle-Events.patch diff --git a/patches/server/1055-Item-serialization-as-json.patch b/patches/server/1054-Item-serialization-as-json.patch similarity index 100% rename from patches/server/1055-Item-serialization-as-json.patch rename to patches/server/1054-Item-serialization-as-json.patch diff --git a/patches/server/1056-Validate-slot-in-PlayerInventory-setSlot.patch b/patches/server/1055-Validate-slot-in-PlayerInventory-setSlot.patch similarity index 100% rename from patches/server/1056-Validate-slot-in-PlayerInventory-setSlot.patch rename to patches/server/1055-Validate-slot-in-PlayerInventory-setSlot.patch diff --git a/patches/server/1057-Remove-wall-time-unused-skip-tick-protection.patch b/patches/server/1056-Remove-wall-time-unused-skip-tick-protection.patch similarity index 100% rename from patches/server/1057-Remove-wall-time-unused-skip-tick-protection.patch rename to patches/server/1056-Remove-wall-time-unused-skip-tick-protection.patch diff --git a/patches/server/1058-Disable-pretty-printing-for-advancement-saving.patch b/patches/server/1057-Disable-pretty-printing-for-advancement-saving.patch similarity index 92% rename from patches/server/1058-Disable-pretty-printing-for-advancement-saving.patch rename to patches/server/1057-Disable-pretty-printing-for-advancement-saving.patch index e954fc53fa..9a966bd656 100644 --- a/patches/server/1058-Disable-pretty-printing-for-advancement-saving.patch +++ b/patches/server/1057-Disable-pretty-printing-for-advancement-saving.patch @@ -8,7 +8,7 @@ Not sure why advancements even had pretty printing enabled. My best guess was by accident on mojang's part, especially since stats json files don't have pretty printing. diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java -index 9fabf9322..862a4bf00 100644 +index 9fabf9322acd663c4452b562494e74aa42eb19da..862a4bf003b7f810fb57dbcd150a1417c902b633 100644 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java @@ -50,7 +50,7 @@ import org.slf4j.Logger;