diff --git a/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch deleted file mode 100644 index 316ea7f83..000000000 --- a/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch +++ /dev/null @@ -1,319 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mark Vainomaa -Date: Wed, 12 Sep 2018 18:53:35 +0300 -Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values - - -diff --git a/src/main/java/com/destroystokyo/paper/Namespaced.java b/src/main/java/com/destroystokyo/paper/Namespaced.java -new file mode 100644 -index 0000000000000000000000000000000000000000..cd1a34b82870684e09e18c47169bd472ecbbb91f ---- /dev/null -+++ b/src/main/java/com/destroystokyo/paper/Namespaced.java -@@ -0,0 +1,40 @@ -+package com.destroystokyo.paper; -+ -+import org.jetbrains.annotations.NotNull; -+ -+/** -+ * Represents a namespaced resource, see {@link org.bukkit.NamespacedKey} for single elements -+ * or {@link com.destroystokyo.paper.NamespacedTag} for a collection of elements -+ * -+ * Namespaces may only contain lowercase alphanumeric characters, periods, -+ * underscores, and hyphens. -+ *

-+ * Keys may only contain lowercase alphanumeric characters, periods, -+ * underscores, hyphens, and forward slashes. -+ *

-+ * You should not be implementing this interface yourself, use {@link org.bukkit.NamespacedKey} -+ * or {@link com.destroystokyo.paper.NamespacedTag} as needed instead. -+ */ -+public interface Namespaced { -+ /** -+ * Gets the namespace this resource is a part of -+ *

-+ * This is contractually obligated to only contain lowercase alphanumeric characters, -+ * periods, underscores, and hyphens. -+ * -+ * @return resource namespace -+ */ -+ @NotNull -+ String getNamespace(); -+ -+ /** -+ * Gets the key corresponding to this resource -+ *

-+ * This is contractually obligated to only contain lowercase alphanumeric characters, -+ * periods, underscores, hyphens, and forward slashes. -+ * -+ * @return resource key -+ */ -+ @NotNull -+ String getKey(); -+} -diff --git a/src/main/java/com/destroystokyo/paper/NamespacedTag.java b/src/main/java/com/destroystokyo/paper/NamespacedTag.java -new file mode 100644 -index 0000000000000000000000000000000000000000..28f3fda950999a9c964a3608042ca60567ae1d6a ---- /dev/null -+++ b/src/main/java/com/destroystokyo/paper/NamespacedTag.java -@@ -0,0 +1,142 @@ -+package com.destroystokyo.paper; -+ -+import com.google.common.base.Preconditions; -+import java.util.Locale; -+import java.util.UUID; -+import java.util.regex.Pattern; -+import org.bukkit.plugin.Plugin; -+import org.jetbrains.annotations.NotNull; -+ -+/** -+ * Represents a String based key pertaining to a tagged entry. Consists of two components - a namespace -+ * and a key. -+ *

-+ * Namespaces may only contain lowercase alphanumeric characters, periods, -+ * underscores, and hyphens. -+ *

-+ * Keys may only contain lowercase alphanumeric characters, periods, -+ * underscores, hyphens, and forward slashes. -+ * -+ */ -+// Paper - entire class, based on org.bukkit.NamespacedKey -+public final class NamespacedTag implements com.destroystokyo.paper.Namespaced { -+ -+ /** -+ * The namespace representing all inbuilt keys. -+ */ -+ public static final String MINECRAFT = "minecraft"; -+ /** -+ * The namespace representing all keys generated by Bukkit for backwards -+ * compatibility measures. -+ */ -+ public static final String BUKKIT = "bukkit"; -+ // -+ private static final Pattern VALID_NAMESPACE = Pattern.compile("[a-z0-9._-]+"); -+ private static final Pattern VALID_KEY = Pattern.compile("[a-z0-9/._-]+"); -+ // -+ private final String namespace; -+ private final String key; -+ -+ /** -+ * Create a key in a specific namespace. -+ * -+ * @param namespace String representing a grouping of keys -+ * @param key Name for this specific key -+ * @deprecated should never be used by plugins, for internal use only!! -+ */ -+ @Deprecated -+ public NamespacedTag(@NotNull String namespace, @NotNull String key) { -+ Preconditions.checkArgument(namespace != null && VALID_NAMESPACE.matcher(namespace).matches(), "Invalid namespace. Must be [a-z0-9._-]: %s", namespace); -+ Preconditions.checkArgument(key != null && VALID_KEY.matcher(key).matches(), "Invalid key. Must be [a-z0-9/._-]: %s", key); -+ -+ this.namespace = namespace; -+ this.key = key; -+ -+ String string = toString(); -+ Preconditions.checkArgument(string.length() < 256, "NamespacedTag must be less than 256 characters", string); -+ } -+ -+ /** -+ * Create a key in the plugin's namespace. -+ *

-+ * Namespaces may only contain lowercase alphanumeric characters, periods, -+ * underscores, and hyphens. -+ *

-+ * Keys may only contain lowercase alphanumeric characters, periods, -+ * underscores, hyphens, and forward slashes. -+ * -+ * @param plugin the plugin to use for the namespace -+ * @param key the key to create -+ */ -+ public NamespacedTag(@NotNull Plugin plugin, @NotNull String key) { -+ Preconditions.checkArgument(plugin != null, "Plugin cannot be null"); -+ Preconditions.checkArgument(key != null, "Key cannot be null"); -+ -+ this.namespace = plugin.getName().toLowerCase(Locale.ROOT); -+ this.key = key.toLowerCase().toLowerCase(Locale.ROOT); -+ -+ // Check validity after normalization -+ Preconditions.checkArgument(VALID_NAMESPACE.matcher(this.namespace).matches(), "Invalid namespace. Must be [a-z0-9._-]: %s", this.namespace); -+ Preconditions.checkArgument(VALID_KEY.matcher(this.key).matches(), "Invalid key. Must be [a-z0-9/._-]: %s", this.key); -+ -+ String string = toString(); -+ Preconditions.checkArgument(string.length() < 256, "NamespacedTag must be less than 256 characters (%s)", string); -+ } -+ -+ @NotNull -+ public String getNamespace() { -+ return namespace; -+ } -+ -+ @NotNull -+ public String getKey() { -+ return key; -+ } -+ -+ @Override -+ public int hashCode() { -+ int hash = 7; -+ hash = 47 * hash + this.namespace.hashCode(); -+ hash = 47 * hash + this.key.hashCode(); -+ return hash; -+ } -+ -+ @Override -+ public boolean equals(Object obj) { -+ if (obj == null) { -+ return false; -+ } -+ if (getClass() != obj.getClass()) { -+ return false; -+ } -+ final NamespacedTag other = (NamespacedTag) obj; -+ return this.namespace.equals(other.namespace) && this.key.equals(other.key); -+ } -+ -+ @Override -+ public String toString() { -+ return "#" + this.namespace + ":" + this.key; -+ } -+ -+ /** -+ * Return a new random key in the {@link #BUKKIT} namespace. -+ * -+ * @return new key -+ * @deprecated should never be used by plugins, for internal use only!! -+ */ -+ @Deprecated -+ public static NamespacedTag randomKey() { -+ return new NamespacedTag(BUKKIT, UUID.randomUUID().toString()); -+ } -+ -+ /** -+ * Get a key in the Minecraft namespace. -+ * -+ * @param key the key to use -+ * @return new key in the Minecraft namespace -+ */ -+ @NotNull -+ public static NamespacedTag minecraft(@NotNull String key) { -+ return new NamespacedTag(MINECRAFT, key); -+ } -+} -diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java -index 4034fcb9abc39b12f0de47c4b679f2ef82353c89..6fa219aef009f8dfb8a2b1e5ee0603b18cf3d0f5 100644 ---- a/src/main/java/org/bukkit/NamespacedKey.java -+++ b/src/main/java/org/bukkit/NamespacedKey.java -@@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable; - * underscores, hyphens, and forward slashes. - * - */ --public final class NamespacedKey implements net.kyori.adventure.key.Key { // Paper - implement Key -+public final class NamespacedKey implements net.kyori.adventure.key.Key, com.destroystokyo.paper.Namespaced { // Paper - implement Key and Namespaced - - /** - * The namespace representing all inbuilt keys. -@@ -119,11 +119,13 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key { // Pap - } - - @NotNull -+ @Override // Paper - public String getNamespace() { - return namespace; - } - - @NotNull -+ @Override // Paper - public String getKey() { - return key; - } -diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index dff32cedf47e95fe14a865898d76b62748dee5f3..de38d9b667e04852c7bdccfa17cbabb1512f4c19 100644 ---- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -@@ -622,4 +622,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste - @SuppressWarnings("javadoc") - @NotNull - ItemMeta clone(); -+ -+ // Paper start - Add an API for CanPlaceOn and CanDestroy NBT values -+ /** -+ * Gets set of materials what given item can destroy in {@link org.bukkit.GameMode#ADVENTURE} -+ * -+ * @return Set of materials -+ * @deprecated Minecraft does not limit this to the material enum, Use {@link #getDestroyableKeys()} as a replacement -+ */ -+ @Deprecated -+ Set getCanDestroy(); -+ -+ /** -+ * Sets set of materials what given item can destroy in {@link org.bukkit.GameMode#ADVENTURE} -+ * -+ * @param canDestroy Set of materials -+ * @deprecated Minecraft does not limit this to the material enum, Use {@link #setDestroyableKeys(Collection)} as a replacement -+ */ -+ @Deprecated -+ void setCanDestroy(Set canDestroy); -+ -+ /** -+ * Gets set of materials where given item can be placed on in {@link org.bukkit.GameMode#ADVENTURE} -+ * -+ * @return Set of materials -+ * @deprecated Minecraft does not limit this to the material enum, Use {@link #getPlaceableKeys()} as a replacement -+ */ -+ @Deprecated -+ Set getCanPlaceOn(); -+ -+ /** -+ * Sets set of materials where given item can be placed on in {@link org.bukkit.GameMode#ADVENTURE} -+ * -+ * @param canPlaceOn Set of materials -+ * @deprecated Minecraft does not limit this to the material enum, Use {@link #setPlaceableKeys(Collection)} as a replacement -+ */ -+ @Deprecated -+ void setCanPlaceOn(Set canPlaceOn); -+ -+ /** -+ * Gets the collection of namespaced keys that the item can destroy in {@link org.bukkit.GameMode#ADVENTURE} -+ * -+ * @return Set of {@link com.destroystokyo.paper.Namespaced} -+ */ -+ @NotNull -+ Set getDestroyableKeys(); -+ -+ /** -+ * Sets the collection of namespaced keys that the item can destroy in {@link org.bukkit.GameMode#ADVENTURE} -+ * -+ * @param canDestroy Collection of {@link com.destroystokyo.paper.Namespaced} -+ */ -+ void setDestroyableKeys(@NotNull Collection canDestroy); -+ -+ /** -+ * Gets the collection of namespaced keys that the item can be placed on in {@link org.bukkit.GameMode#ADVENTURE} -+ * -+ * @return Set of {@link com.destroystokyo.paper.Namespaced} -+ */ -+ @NotNull -+ Set getPlaceableKeys(); -+ -+ /** -+ * Sets the set of namespaced keys that the item can be placed on in {@link org.bukkit.GameMode#ADVENTURE} -+ * -+ * @param canPlaceOn Collection of {@link com.destroystokyo.paper.Namespaced} -+ */ -+ @NotNull -+ void setPlaceableKeys(@NotNull Collection canPlaceOn); -+ -+ /** -+ * Checks for the existence of any keys that the item can be placed on -+ * -+ * @return true if this item has placeable keys -+ */ -+ boolean hasPlaceableKeys(); -+ -+ /** -+ * Checks for the existence of any keys that the item can destroy -+ * -+ * @return true if this item has destroyable keys -+ */ -+ boolean hasDestroyableKeys(); -+ // Paper end - } diff --git a/patches/api/0150-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch similarity index 100% rename from patches/api/0150-Performance-Concurrency-Improvements-to-Permissions.patch rename to patches/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch diff --git a/patches/api/0151-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch similarity index 100% rename from patches/api/0151-Add-ItemStackRecipeChoice-Draft-API.patch rename to patches/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch diff --git a/patches/api/0152-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/api/0152-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/api/0153-Material-API-additions.patch b/patches/api/0152-Material-API-additions.patch similarity index 100% rename from patches/api/0153-Material-API-additions.patch rename to patches/api/0152-Material-API-additions.patch diff --git a/patches/api/0154-Add-Material-Tags.patch b/patches/api/0153-Add-Material-Tags.patch similarity index 100% rename from patches/api/0154-Add-Material-Tags.patch rename to patches/api/0153-Add-Material-Tags.patch diff --git a/patches/api/0155-PreSpawnerSpawnEvent.patch b/patches/api/0154-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/api/0155-PreSpawnerSpawnEvent.patch rename to patches/api/0154-PreSpawnerSpawnEvent.patch diff --git a/patches/api/0156-Add-LivingEntity-getTargetEntity.patch b/patches/api/0155-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/api/0156-Add-LivingEntity-getTargetEntity.patch rename to patches/api/0155-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/api/0157-Add-sun-related-API.patch b/patches/api/0156-Add-sun-related-API.patch similarity index 100% rename from patches/api/0157-Add-sun-related-API.patch rename to patches/api/0156-Add-sun-related-API.patch diff --git a/patches/api/0158-Turtle-API.patch b/patches/api/0157-Turtle-API.patch similarity index 100% rename from patches/api/0158-Turtle-API.patch rename to patches/api/0157-Turtle-API.patch diff --git a/patches/api/0159-Add-spectator-target-events.patch b/patches/api/0158-Add-spectator-target-events.patch similarity index 100% rename from patches/api/0159-Add-spectator-target-events.patch rename to patches/api/0158-Add-spectator-target-events.patch diff --git a/patches/api/0160-Add-more-Witch-API.patch b/patches/api/0159-Add-more-Witch-API.patch similarity index 100% rename from patches/api/0160-Add-more-Witch-API.patch rename to patches/api/0159-Add-more-Witch-API.patch diff --git a/patches/api/0161-Make-the-default-permission-message-configurable.patch b/patches/api/0160-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/api/0161-Make-the-default-permission-message-configurable.patch rename to patches/api/0160-Make-the-default-permission-message-configurable.patch diff --git a/patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch similarity index 100% rename from patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch rename to patches/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch diff --git a/patches/api/0163-Add-more-Zombie-API.patch b/patches/api/0162-Add-more-Zombie-API.patch similarity index 100% rename from patches/api/0163-Add-more-Zombie-API.patch rename to patches/api/0162-Add-more-Zombie-API.patch diff --git a/patches/api/0164-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch similarity index 100% rename from patches/api/0164-Change-the-reserved-channel-check-to-be-sensible.patch rename to patches/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch diff --git a/patches/api/0165-Add-PlayerConnectionCloseEvent.patch b/patches/api/0164-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/api/0165-Add-PlayerConnectionCloseEvent.patch rename to patches/api/0164-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/api/0166-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/api/0166-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/api/0167-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch similarity index 100% rename from patches/api/0167-Add-ItemStack-Recipe-API-helper-methods.patch rename to patches/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch diff --git a/patches/api/0168-BlockDestroyEvent.patch b/patches/api/0167-BlockDestroyEvent.patch similarity index 100% rename from patches/api/0168-BlockDestroyEvent.patch rename to patches/api/0167-BlockDestroyEvent.patch diff --git a/patches/api/0169-Add-WhitelistToggleEvent.patch b/patches/api/0168-Add-WhitelistToggleEvent.patch similarity index 100% rename from patches/api/0169-Add-WhitelistToggleEvent.patch rename to patches/api/0168-Add-WhitelistToggleEvent.patch diff --git a/patches/api/0170-Add-GS4-Query-event.patch b/patches/api/0169-Add-GS4-Query-event.patch similarity index 100% rename from patches/api/0170-Add-GS4-Query-event.patch rename to patches/api/0169-Add-GS4-Query-event.patch diff --git a/patches/api/0171-Add-PlayerPostRespawnEvent.patch b/patches/api/0170-Add-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/api/0171-Add-PlayerPostRespawnEvent.patch rename to patches/api/0170-Add-PlayerPostRespawnEvent.patch diff --git a/patches/api/0172-Entity-getEntitySpawnReason.patch b/patches/api/0171-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/api/0172-Entity-getEntitySpawnReason.patch rename to patches/api/0171-Entity-getEntitySpawnReason.patch diff --git a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch similarity index 99% rename from patches/api/0173-Fix-Spigot-annotation-mistakes.patch rename to patches/api/0172-Fix-Spigot-annotation-mistakes.patch index d5238fc21..20b9c8bf1 100644 --- a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch @@ -352,10 +352,10 @@ index 7ce1a0ee5504d4faf548be73be784e87cd4049fe..76c96e1a82366aafa0148a1260500a38 switch (this) { // diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java -index 6fa219aef009f8dfb8a2b1e5ee0603b18cf3d0f5..8ac72cb0b05e2c493d98310f2e87c3714d15c5e3 100644 +index 4034fcb9abc39b12f0de47c4b679f2ef82353c89..5a2032fde327be45b44fd6aa99808fe7c3054e1b 100644 --- a/src/main/java/org/bukkit/NamespacedKey.java +++ b/src/main/java/org/bukkit/NamespacedKey.java -@@ -74,12 +74,14 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des +@@ -74,12 +74,14 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key { // Pap /** * Create a key in a specific namespace. @@ -1602,7 +1602,7 @@ index 597a18a767b68b47e81454b7d44613c7178c1366..bc3440eb72127824b3961fbdae583bb6 public ItemStack getInput() { return this.ingredient.getItemStack(); diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index de38d9b667e04852c7bdccfa17cbabb1512f4c19..e1edd463b522a0f610b82917654b7d87ffc3de22 100644 +index dff32cedf47e95fe14a865898d76b62748dee5f3..05a57b42e874c6e50149aa253861abaf5e17cef0 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -111,6 +111,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste diff --git a/patches/api/0174-Server-Tick-Events.patch b/patches/api/0173-Server-Tick-Events.patch similarity index 100% rename from patches/api/0174-Server-Tick-Events.patch rename to patches/api/0173-Server-Tick-Events.patch diff --git a/patches/api/0175-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/api/0175-PlayerDeathEvent-getItemsToKeep.patch rename to patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/api/0176-Add-Heightmap-API.patch b/patches/api/0175-Add-Heightmap-API.patch similarity index 100% rename from patches/api/0176-Add-Heightmap-API.patch rename to patches/api/0175-Add-Heightmap-API.patch diff --git a/patches/api/0177-Mob-Spawner-API-Enhancements.patch b/patches/api/0176-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/api/0177-Mob-Spawner-API-Enhancements.patch rename to patches/api/0176-Mob-Spawner-API-Enhancements.patch diff --git a/patches/api/0178-Add-BlockSoundGroup-interface.patch b/patches/api/0177-Add-BlockSoundGroup-interface.patch similarity index 100% rename from patches/api/0178-Add-BlockSoundGroup-interface.patch rename to patches/api/0177-Add-BlockSoundGroup-interface.patch diff --git a/patches/api/0179-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch similarity index 100% rename from patches/api/0179-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch rename to patches/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch diff --git a/patches/api/0180-Set-true-custom-payload-channel-size-limit.patch b/patches/api/0179-Set-true-custom-payload-channel-size-limit.patch similarity index 100% rename from patches/api/0180-Set-true-custom-payload-channel-size-limit.patch rename to patches/api/0179-Set-true-custom-payload-channel-size-limit.patch diff --git a/patches/api/0181-Expose-the-internal-current-tick.patch b/patches/api/0180-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/api/0181-Expose-the-internal-current-tick.patch rename to patches/api/0180-Expose-the-internal-current-tick.patch diff --git a/patches/api/0182-Improve-Block-breakNaturally-API.patch b/patches/api/0181-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/api/0182-Improve-Block-breakNaturally-API.patch rename to patches/api/0181-Improve-Block-breakNaturally-API.patch diff --git a/patches/api/0183-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/api/0183-PlayerDeathEvent-shouldDropExperience.patch rename to patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/api/0184-Add-ThrownEggHatchEvent.patch b/patches/api/0183-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/api/0184-Add-ThrownEggHatchEvent.patch rename to patches/api/0183-Add-ThrownEggHatchEvent.patch diff --git a/patches/api/0185-Entity-Jump-API.patch b/patches/api/0184-Entity-Jump-API.patch similarity index 100% rename from patches/api/0185-Entity-Jump-API.patch rename to patches/api/0184-Entity-Jump-API.patch diff --git a/patches/api/0186-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0185-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/api/0186-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/api/0185-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/api/0187-Add-tick-times-API.patch b/patches/api/0186-Add-tick-times-API.patch similarity index 100% rename from patches/api/0187-Add-tick-times-API.patch rename to patches/api/0186-Add-tick-times-API.patch diff --git a/patches/api/0188-Expose-MinecraftServer-isRunning.patch b/patches/api/0187-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/api/0188-Expose-MinecraftServer-isRunning.patch rename to patches/api/0187-Expose-MinecraftServer-isRunning.patch diff --git a/patches/api/0189-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/api/0189-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/api/0190-Add-Player-Client-Options-API.patch b/patches/api/0189-Add-Player-Client-Options-API.patch similarity index 100% rename from patches/api/0190-Add-Player-Client-Options-API.patch rename to patches/api/0189-Add-Player-Client-Options-API.patch diff --git a/patches/api/0191-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0190-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/api/0191-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/api/0190-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/api/0192-Add-item-slot-convenience-methods.patch b/patches/api/0191-Add-item-slot-convenience-methods.patch similarity index 100% rename from patches/api/0192-Add-item-slot-convenience-methods.patch rename to patches/api/0191-Add-item-slot-convenience-methods.patch diff --git a/patches/api/0193-Villager-Restocks-API.patch b/patches/api/0192-Villager-Restocks-API.patch similarity index 100% rename from patches/api/0193-Villager-Restocks-API.patch rename to patches/api/0192-Villager-Restocks-API.patch diff --git a/patches/api/0194-Expose-game-version.patch b/patches/api/0193-Expose-game-version.patch similarity index 100% rename from patches/api/0194-Expose-game-version.patch rename to patches/api/0193-Expose-game-version.patch diff --git a/patches/api/0195-Add-Mob-Goal-API.patch b/patches/api/0194-Add-Mob-Goal-API.patch similarity index 100% rename from patches/api/0195-Add-Mob-Goal-API.patch rename to patches/api/0194-Add-Mob-Goal-API.patch diff --git a/patches/api/0196-Add-villager-reputation-API.patch b/patches/api/0195-Add-villager-reputation-API.patch similarity index 100% rename from patches/api/0196-Add-villager-reputation-API.patch rename to patches/api/0195-Add-villager-reputation-API.patch diff --git a/patches/api/0197-Spawn-Reason-API.patch b/patches/api/0196-Spawn-Reason-API.patch similarity index 100% rename from patches/api/0197-Spawn-Reason-API.patch rename to patches/api/0196-Spawn-Reason-API.patch diff --git a/patches/api/0198-Potential-bed-API.patch b/patches/api/0197-Potential-bed-API.patch similarity index 100% rename from patches/api/0198-Potential-bed-API.patch rename to patches/api/0197-Potential-bed-API.patch diff --git a/patches/api/0199-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0198-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/api/0199-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/api/0198-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/api/0200-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0199-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/api/0200-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/api/0199-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/api/0201-Support-components-in-ItemMeta.patch b/patches/api/0200-Support-components-in-ItemMeta.patch similarity index 96% rename from patches/api/0201-Support-components-in-ItemMeta.patch rename to patches/api/0200-Support-components-in-ItemMeta.patch index 9b5e25bd6..def75da5a 100644 --- a/patches/api/0201-Support-components-in-ItemMeta.patch +++ b/patches/api/0200-Support-components-in-ItemMeta.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index e1edd463b522a0f610b82917654b7d87ffc3de22..c20d39f0f88e6059803ef44b8460f2de67c5e8a9 100644 +index 05a57b42e874c6e50149aa253861abaf5e17cef0..ab69711ebd81fb512c7abebc5b439e89a4754bd2 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -5,6 +5,7 @@ import java.util.Collection; diff --git a/patches/api/0202-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0201-added-2-new-TargetReasons-for-1.16-mob-behavior.patch similarity index 100% rename from patches/api/0202-added-2-new-TargetReasons-for-1.16-mob-behavior.patch rename to patches/api/0201-added-2-new-TargetReasons-for-1.16-mob-behavior.patch diff --git a/patches/api/0203-Add-entity-liquid-API.patch b/patches/api/0202-Add-entity-liquid-API.patch similarity index 100% rename from patches/api/0203-Add-entity-liquid-API.patch rename to patches/api/0202-Add-entity-liquid-API.patch diff --git a/patches/api/0204-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0203-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch similarity index 100% rename from patches/api/0204-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch rename to patches/api/0203-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch diff --git a/patches/api/0205-Add-BellRingEvent.patch b/patches/api/0204-Add-BellRingEvent.patch similarity index 100% rename from patches/api/0205-Add-BellRingEvent.patch rename to patches/api/0204-Add-BellRingEvent.patch diff --git a/patches/api/0206-Brand-support.patch b/patches/api/0205-Brand-support.patch similarity index 100% rename from patches/api/0206-Brand-support.patch rename to patches/api/0205-Brand-support.patch diff --git a/patches/api/0207-Add-moon-phase-API.patch b/patches/api/0206-Add-moon-phase-API.patch similarity index 100% rename from patches/api/0207-Add-moon-phase-API.patch rename to patches/api/0206-Add-moon-phase-API.patch diff --git a/patches/api/0208-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0207-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/api/0208-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/api/0207-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/api/0209-Add-more-Evoker-API.patch b/patches/api/0208-Add-more-Evoker-API.patch similarity index 100% rename from patches/api/0209-Add-more-Evoker-API.patch rename to patches/api/0208-Add-more-Evoker-API.patch diff --git a/patches/api/0210-Add-methods-to-get-translation-keys.patch b/patches/api/0209-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/api/0210-Add-methods-to-get-translation-keys.patch rename to patches/api/0209-Add-methods-to-get-translation-keys.patch diff --git a/patches/api/0211-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0210-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/api/0211-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/api/0210-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/api/0212-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0211-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/api/0212-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/api/0211-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/api/0213-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0212-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/api/0213-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/api/0212-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/api/0214-Entity-isTicking.patch b/patches/api/0213-Entity-isTicking.patch similarity index 100% rename from patches/api/0214-Entity-isTicking.patch rename to patches/api/0213-Entity-isTicking.patch diff --git a/patches/api/0215-Villager-resetOffers.patch b/patches/api/0214-Villager-resetOffers.patch similarity index 100% rename from patches/api/0215-Villager-resetOffers.patch rename to patches/api/0214-Villager-resetOffers.patch diff --git a/patches/api/0216-Player-elytra-boost-API.patch b/patches/api/0215-Player-elytra-boost-API.patch similarity index 100% rename from patches/api/0216-Player-elytra-boost-API.patch rename to patches/api/0215-Player-elytra-boost-API.patch diff --git a/patches/api/0217-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0216-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/api/0217-Add-getOfflinePlayerIfCached-String.patch rename to patches/api/0216-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/api/0218-Add-ignore-discounts-API.patch b/patches/api/0217-Add-ignore-discounts-API.patch similarity index 100% rename from patches/api/0218-Add-ignore-discounts-API.patch rename to patches/api/0217-Add-ignore-discounts-API.patch diff --git a/patches/api/0219-Item-no-age-no-player-pickup.patch b/patches/api/0218-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/api/0219-Item-no-age-no-player-pickup.patch rename to patches/api/0218-Item-no-age-no-player-pickup.patch diff --git a/patches/api/0220-Beacon-API-custom-effect-ranges.patch b/patches/api/0219-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/api/0220-Beacon-API-custom-effect-ranges.patch rename to patches/api/0219-Beacon-API-custom-effect-ranges.patch diff --git a/patches/api/0221-Add-API-for-quit-reason.patch b/patches/api/0220-Add-API-for-quit-reason.patch similarity index 100% rename from patches/api/0221-Add-API-for-quit-reason.patch rename to patches/api/0220-Add-API-for-quit-reason.patch diff --git a/patches/api/0222-Add-Destroy-Speed-API.patch b/patches/api/0221-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/api/0222-Add-Destroy-Speed-API.patch rename to patches/api/0221-Add-Destroy-Speed-API.patch diff --git a/patches/api/0223-Add-LivingEntity-clearActiveItem.patch b/patches/api/0222-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/api/0223-Add-LivingEntity-clearActiveItem.patch rename to patches/api/0222-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/api/0224-Add-PlayerItemCooldownEvent.patch b/patches/api/0223-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/api/0224-Add-PlayerItemCooldownEvent.patch rename to patches/api/0223-Add-PlayerItemCooldownEvent.patch diff --git a/patches/api/0225-More-lightning-API.patch b/patches/api/0224-More-lightning-API.patch similarity index 100% rename from patches/api/0225-More-lightning-API.patch rename to patches/api/0224-More-lightning-API.patch diff --git a/patches/api/0226-Add-PlayerShearBlockEvent.patch b/patches/api/0225-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/api/0226-Add-PlayerShearBlockEvent.patch rename to patches/api/0225-Add-PlayerShearBlockEvent.patch diff --git a/patches/api/0227-Player-Chunk-Load-Unload-Events.patch b/patches/api/0226-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/api/0227-Player-Chunk-Load-Unload-Events.patch rename to patches/api/0226-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/api/0228-Expose-LivingEntity-hurt-direction.patch b/patches/api/0227-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/api/0228-Expose-LivingEntity-hurt-direction.patch rename to patches/api/0227-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/api/0229-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0228-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/api/0229-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/api/0228-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/api/0230-Added-PlayerTradeEvent.patch b/patches/api/0229-Added-PlayerTradeEvent.patch similarity index 100% rename from patches/api/0230-Added-PlayerTradeEvent.patch rename to patches/api/0229-Added-PlayerTradeEvent.patch diff --git a/patches/api/0231-Add-TargetHitEvent-API.patch b/patches/api/0230-Add-TargetHitEvent-API.patch similarity index 100% rename from patches/api/0231-Add-TargetHitEvent-API.patch rename to patches/api/0230-Add-TargetHitEvent-API.patch diff --git a/patches/api/0232-Additional-Block-Material-API-s.patch b/patches/api/0231-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/api/0232-Additional-Block-Material-API-s.patch rename to patches/api/0231-Additional-Block-Material-API-s.patch diff --git a/patches/api/0233-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0232-Add-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/api/0233-Add-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/api/0232-Add-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/api/0234-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0233-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/api/0234-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/api/0233-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/api/0235-Zombie-API-breaking-doors.patch b/patches/api/0234-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/api/0235-Zombie-API-breaking-doors.patch rename to patches/api/0234-Zombie-API-breaking-doors.patch diff --git a/patches/api/0236-Add-EntityLoadCrossbowEvent.patch b/patches/api/0235-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/api/0236-Add-EntityLoadCrossbowEvent.patch rename to patches/api/0235-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/api/0237-Added-WorldGameRuleChangeEvent.patch b/patches/api/0236-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/api/0237-Added-WorldGameRuleChangeEvent.patch rename to patches/api/0236-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/api/0238-Added-ServerResourcesReloadedEvent.patch b/patches/api/0237-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/api/0238-Added-ServerResourcesReloadedEvent.patch rename to patches/api/0237-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/api/0239-Add-BlockFailedDispenseEvent.patch b/patches/api/0238-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/api/0239-Add-BlockFailedDispenseEvent.patch rename to patches/api/0238-Add-BlockFailedDispenseEvent.patch diff --git a/patches/api/0240-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0239-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/api/0240-Added-PlayerLecternPageChangeEvent.patch rename to patches/api/0239-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/api/0241-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0240-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/api/0241-Added-PlayerLoomPatternSelectEvent.patch rename to patches/api/0240-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/api/0242-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0241-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch similarity index 100% rename from patches/api/0242-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch rename to patches/api/0241-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch diff --git a/patches/api/0243-Add-sendOpLevel-API.patch b/patches/api/0242-Add-sendOpLevel-API.patch similarity index 100% rename from patches/api/0243-Add-sendOpLevel-API.patch rename to patches/api/0242-Add-sendOpLevel-API.patch diff --git a/patches/api/0244-Add-PaperRegistry.patch b/patches/api/0243-Add-PaperRegistry.patch similarity index 100% rename from patches/api/0244-Add-PaperRegistry.patch rename to patches/api/0243-Add-PaperRegistry.patch diff --git a/patches/api/0245-Add-StructuresLocateEvent.patch b/patches/api/0244-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/api/0245-Add-StructuresLocateEvent.patch rename to patches/api/0244-Add-StructuresLocateEvent.patch diff --git a/patches/api/0246-Add-BlockPreDispenseEvent.patch b/patches/api/0245-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/api/0246-Add-BlockPreDispenseEvent.patch rename to patches/api/0245-Add-BlockPreDispenseEvent.patch diff --git a/patches/api/0247-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0246-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/api/0247-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/api/0246-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/api/0248-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0247-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/api/0248-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/api/0247-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/api/0249-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0248-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/api/0249-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/api/0248-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/api/0250-add-DragonEggFormEvent.patch b/patches/api/0249-add-DragonEggFormEvent.patch similarity index 100% rename from patches/api/0250-add-DragonEggFormEvent.patch rename to patches/api/0249-add-DragonEggFormEvent.patch diff --git a/patches/api/0251-EntityMoveEvent.patch b/patches/api/0250-EntityMoveEvent.patch similarity index 100% rename from patches/api/0251-EntityMoveEvent.patch rename to patches/api/0250-EntityMoveEvent.patch diff --git a/patches/api/0252-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0251-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/api/0252-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/api/0251-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/api/0253-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0252-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/api/0253-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/api/0252-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/api/0254-living-entity-allow-attribute-registration.patch b/patches/api/0253-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/api/0254-living-entity-allow-attribute-registration.patch rename to patches/api/0253-living-entity-allow-attribute-registration.patch diff --git a/patches/api/0255-Add-missing-effects.patch b/patches/api/0254-Add-missing-effects.patch similarity index 100% rename from patches/api/0255-Add-missing-effects.patch rename to patches/api/0254-Add-missing-effects.patch diff --git a/patches/api/0256-Expose-Tracked-Players.patch b/patches/api/0255-Expose-Tracked-Players.patch similarity index 100% rename from patches/api/0256-Expose-Tracked-Players.patch rename to patches/api/0255-Expose-Tracked-Players.patch diff --git a/patches/api/0257-Cache-the-result-of-Material-isBlock.patch b/patches/api/0256-Cache-the-result-of-Material-isBlock.patch similarity index 100% rename from patches/api/0257-Cache-the-result-of-Material-isBlock.patch rename to patches/api/0256-Cache-the-result-of-Material-isBlock.patch diff --git a/patches/api/0258-Add-worldborder-events.patch b/patches/api/0257-Add-worldborder-events.patch similarity index 100% rename from patches/api/0258-Add-worldborder-events.patch rename to patches/api/0257-Add-worldborder-events.patch diff --git a/patches/api/0259-added-PlayerNameEntityEvent.patch b/patches/api/0258-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/api/0259-added-PlayerNameEntityEvent.patch rename to patches/api/0258-added-PlayerNameEntityEvent.patch diff --git a/patches/api/0260-Add-recipe-to-cook-events.patch b/patches/api/0259-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/api/0260-Add-recipe-to-cook-events.patch rename to patches/api/0259-Add-recipe-to-cook-events.patch diff --git a/patches/api/0261-Add-Block-isValidTool.patch b/patches/api/0260-Add-Block-isValidTool.patch similarity index 100% rename from patches/api/0261-Add-Block-isValidTool.patch rename to patches/api/0260-Add-Block-isValidTool.patch diff --git a/patches/api/0262-Expand-world-key-API.patch b/patches/api/0261-Expand-world-key-API.patch similarity index 100% rename from patches/api/0262-Expand-world-key-API.patch rename to patches/api/0261-Expand-world-key-API.patch diff --git a/patches/api/0263-Item-Rarity-API.patch b/patches/api/0262-Item-Rarity-API.patch similarity index 100% rename from patches/api/0263-Item-Rarity-API.patch rename to patches/api/0262-Item-Rarity-API.patch diff --git a/patches/api/0264-Expose-protocol-version.patch b/patches/api/0263-Expose-protocol-version.patch similarity index 100% rename from patches/api/0264-Expose-protocol-version.patch rename to patches/api/0263-Expose-protocol-version.patch diff --git a/patches/api/0265-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0264-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/api/0265-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/api/0264-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/api/0266-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0265-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/api/0266-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/api/0265-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/api/0267-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0266-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/api/0267-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/api/0266-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/api/0268-Added-PlayerDeepSleepEvent.patch b/patches/api/0267-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/api/0268-Added-PlayerDeepSleepEvent.patch rename to patches/api/0267-Added-PlayerDeepSleepEvent.patch diff --git a/patches/api/0269-More-World-API.patch b/patches/api/0268-More-World-API.patch similarity index 100% rename from patches/api/0269-More-World-API.patch rename to patches/api/0268-More-World-API.patch diff --git a/patches/api/0270-Added-PlayerBedFailEnterEvent.patch b/patches/api/0269-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/api/0270-Added-PlayerBedFailEnterEvent.patch rename to patches/api/0269-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/api/0271-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0270-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/api/0271-Introduce-beacon-activation-deactivation-events.patch rename to patches/api/0270-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/api/0272-PlayerMoveEvent-Improvements.patch b/patches/api/0271-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/api/0272-PlayerMoveEvent-Improvements.patch rename to patches/api/0271-PlayerMoveEvent-Improvements.patch diff --git a/patches/api/0273-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0272-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/api/0273-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/api/0272-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/api/0274-Add-more-WanderingTrader-API.patch b/patches/api/0273-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/api/0274-Add-more-WanderingTrader-API.patch rename to patches/api/0273-Add-more-WanderingTrader-API.patch diff --git a/patches/api/0275-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0274-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/api/0275-Add-EntityBlockStorage-clearEntities.patch rename to patches/api/0274-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/api/0276-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0275-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/api/0276-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/api/0275-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/api/0277-Inventory-close.patch b/patches/api/0276-Inventory-close.patch similarity index 100% rename from patches/api/0277-Inventory-close.patch rename to patches/api/0276-Inventory-close.patch diff --git a/patches/api/0278-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0277-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/api/0278-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/api/0277-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/api/0279-Add-basic-Datapack-API.patch b/patches/api/0278-Add-basic-Datapack-API.patch similarity index 100% rename from patches/api/0279-Add-basic-Datapack-API.patch rename to patches/api/0278-Add-basic-Datapack-API.patch diff --git a/patches/api/0280-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0279-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/api/0280-additions-to-PlayerGameModeChangeEvent.patch rename to patches/api/0279-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/api/0281-ItemStack-repair-check-API.patch b/patches/api/0280-ItemStack-repair-check-API.patch similarity index 100% rename from patches/api/0281-ItemStack-repair-check-API.patch rename to patches/api/0280-ItemStack-repair-check-API.patch diff --git a/patches/api/0282-More-Enchantment-API.patch b/patches/api/0281-More-Enchantment-API.patch similarity index 100% rename from patches/api/0282-More-Enchantment-API.patch rename to patches/api/0281-More-Enchantment-API.patch diff --git a/patches/api/0283-Add-Mob-lookAt-API.patch b/patches/api/0282-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/api/0283-Add-Mob-lookAt-API.patch rename to patches/api/0282-Add-Mob-lookAt-API.patch diff --git a/patches/api/0284-ItemStack-editMeta.patch b/patches/api/0283-ItemStack-editMeta.patch similarity index 100% rename from patches/api/0284-ItemStack-editMeta.patch rename to patches/api/0283-ItemStack-editMeta.patch diff --git a/patches/api/0285-Add-EntityInsideBlockEvent.patch b/patches/api/0284-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/api/0285-Add-EntityInsideBlockEvent.patch rename to patches/api/0284-Add-EntityInsideBlockEvent.patch diff --git a/patches/api/0286-Attributes-API-for-item-defaults.patch b/patches/api/0285-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/api/0286-Attributes-API-for-item-defaults.patch rename to patches/api/0285-Attributes-API-for-item-defaults.patch diff --git a/patches/api/0287-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0286-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/api/0287-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/api/0286-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/api/0288-More-Lidded-Block-API.patch b/patches/api/0287-More-Lidded-Block-API.patch similarity index 100% rename from patches/api/0288-More-Lidded-Block-API.patch rename to patches/api/0287-More-Lidded-Block-API.patch diff --git a/patches/api/0289-Add-PlayerKickEvent-causes.patch b/patches/api/0288-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/api/0289-Add-PlayerKickEvent-causes.patch rename to patches/api/0288-Add-PlayerKickEvent-causes.patch diff --git a/patches/api/0290-Add-PufferFishStateChangeEvent.patch b/patches/api/0289-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/api/0290-Add-PufferFishStateChangeEvent.patch rename to patches/api/0289-Add-PufferFishStateChangeEvent.patch diff --git a/patches/api/0291-Add-BellRevealRaiderEvent.patch b/patches/api/0290-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/api/0291-Add-BellRevealRaiderEvent.patch rename to patches/api/0290-Add-BellRevealRaiderEvent.patch diff --git a/patches/api/0292-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0291-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/api/0292-Add-ElderGuardianAppearanceEvent.patch rename to patches/api/0291-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/api/0293-Add-more-line-of-sight-methods.patch b/patches/api/0292-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/api/0293-Add-more-line-of-sight-methods.patch rename to patches/api/0292-Add-more-line-of-sight-methods.patch diff --git a/patches/api/0294-Add-WaterBottleSplashEvent.patch b/patches/api/0293-Add-WaterBottleSplashEvent.patch similarity index 100% rename from patches/api/0294-Add-WaterBottleSplashEvent.patch rename to patches/api/0293-Add-WaterBottleSplashEvent.patch diff --git a/patches/api/0295-Add-more-LimitedRegion-API.patch b/patches/api/0294-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/api/0295-Add-more-LimitedRegion-API.patch rename to patches/api/0294-Add-more-LimitedRegion-API.patch diff --git a/patches/api/0296-Missing-Entity-API.patch b/patches/api/0295-Missing-Entity-API.patch similarity index 100% rename from patches/api/0296-Missing-Entity-API.patch rename to patches/api/0295-Missing-Entity-API.patch diff --git a/patches/api/0297-Adds-PlayerArmSwingEvent.patch b/patches/api/0296-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/api/0297-Adds-PlayerArmSwingEvent.patch rename to patches/api/0296-Adds-PlayerArmSwingEvent.patch diff --git a/patches/api/0298-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0297-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/api/0298-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/api/0297-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/api/0299-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0298-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/api/0299-fix-empty-array-elements-in-command-arguments.patch rename to patches/api/0298-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/api/0300-Stinger-API.patch b/patches/api/0299-Stinger-API.patch similarity index 100% rename from patches/api/0300-Stinger-API.patch rename to patches/api/0299-Stinger-API.patch diff --git a/patches/api/0301-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0300-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/api/0301-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/api/0300-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/api/0302-Add-PlayerSetSpawnEvent.patch b/patches/api/0301-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/api/0302-Add-PlayerSetSpawnEvent.patch rename to patches/api/0301-Add-PlayerSetSpawnEvent.patch diff --git a/patches/api/0303-Added-EntityDamageItemEvent.patch b/patches/api/0302-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/api/0303-Added-EntityDamageItemEvent.patch rename to patches/api/0302-Added-EntityDamageItemEvent.patch diff --git a/patches/api/0304-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0303-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/api/0304-Make-EntityUnleashEvent-cancellable.patch rename to patches/api/0303-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/api/0305-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0304-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/api/0305-Change-EnderEye-target-without-changing-other-things.patch rename to patches/api/0304-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/api/0306-Add-BlockBreakBlockEvent.patch b/patches/api/0305-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/api/0306-Add-BlockBreakBlockEvent.patch rename to patches/api/0305-Add-BlockBreakBlockEvent.patch diff --git a/patches/api/0307-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0306-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/api/0307-Add-helpers-for-left-right-click-to-Action.patch rename to patches/api/0306-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/api/0308-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/api/0307-Option-to-prevent-data-components-copy-in-smithing-r.patch similarity index 100% rename from patches/api/0308-Option-to-prevent-data-components-copy-in-smithing-r.patch rename to patches/api/0307-Option-to-prevent-data-components-copy-in-smithing-r.patch diff --git a/patches/api/0309-More-CommandBlock-API.patch b/patches/api/0308-More-CommandBlock-API.patch similarity index 100% rename from patches/api/0309-More-CommandBlock-API.patch rename to patches/api/0308-More-CommandBlock-API.patch diff --git a/patches/api/0310-Add-missing-team-sidebar-display-slots.patch b/patches/api/0309-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/api/0310-Add-missing-team-sidebar-display-slots.patch rename to patches/api/0309-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/api/0311-add-back-EntityPortalExitEvent.patch b/patches/api/0310-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/api/0311-add-back-EntityPortalExitEvent.patch rename to patches/api/0310-add-back-EntityPortalExitEvent.patch diff --git a/patches/api/0312-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0311-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/api/0312-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/api/0311-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/api/0313-Get-entity-default-attributes.patch b/patches/api/0312-Get-entity-default-attributes.patch similarity index 100% rename from patches/api/0313-Get-entity-default-attributes.patch rename to patches/api/0312-Get-entity-default-attributes.patch diff --git a/patches/api/0314-Left-handed-API.patch b/patches/api/0313-Left-handed-API.patch similarity index 100% rename from patches/api/0314-Left-handed-API.patch rename to patches/api/0313-Left-handed-API.patch diff --git a/patches/api/0315-Add-critical-damage-API.patch b/patches/api/0314-Add-critical-damage-API.patch similarity index 100% rename from patches/api/0315-Add-critical-damage-API.patch rename to patches/api/0314-Add-critical-damage-API.patch diff --git a/patches/api/0316-Add-more-advancement-API.patch b/patches/api/0315-Add-more-advancement-API.patch similarity index 100% rename from patches/api/0316-Add-more-advancement-API.patch rename to patches/api/0315-Add-more-advancement-API.patch diff --git a/patches/api/0317-Fix-issues-with-mob-conversion.patch b/patches/api/0316-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/api/0317-Fix-issues-with-mob-conversion.patch rename to patches/api/0316-Fix-issues-with-mob-conversion.patch diff --git a/patches/api/0318-Add-isCollidable-methods-to-various-places.patch b/patches/api/0317-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/api/0318-Add-isCollidable-methods-to-various-places.patch rename to patches/api/0317-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/api/0319-Goat-ram-API.patch b/patches/api/0318-Goat-ram-API.patch similarity index 100% rename from patches/api/0319-Goat-ram-API.patch rename to patches/api/0318-Goat-ram-API.patch diff --git a/patches/api/0320-Add-API-for-resetting-a-single-score.patch b/patches/api/0319-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/api/0320-Add-API-for-resetting-a-single-score.patch rename to patches/api/0319-Add-API-for-resetting-a-single-score.patch diff --git a/patches/api/0321-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0320-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/api/0321-Add-Raw-Byte-Entity-Serialization.patch rename to patches/api/0320-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/api/0322-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0321-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/api/0322-Add-PlayerItemFrameChangeEvent.patch rename to patches/api/0321-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/api/0323-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0322-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/api/0323-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0322-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/api/0324-Add-more-Campfire-API.patch b/patches/api/0323-Add-more-Campfire-API.patch similarity index 100% rename from patches/api/0324-Add-more-Campfire-API.patch rename to patches/api/0323-Add-more-Campfire-API.patch diff --git a/patches/api/0325-Extend-VehicleCollisionEvent-move-HandlerList-up.patch b/patches/api/0324-Extend-VehicleCollisionEvent-move-HandlerList-up.patch similarity index 100% rename from patches/api/0325-Extend-VehicleCollisionEvent-move-HandlerList-up.patch rename to patches/api/0324-Extend-VehicleCollisionEvent-move-HandlerList-up.patch diff --git a/patches/api/0326-Improve-scoreboard-entries.patch b/patches/api/0325-Improve-scoreboard-entries.patch similarity index 100% rename from patches/api/0326-Improve-scoreboard-entries.patch rename to patches/api/0325-Improve-scoreboard-entries.patch diff --git a/patches/api/0327-Entity-powdered-snow-API.patch b/patches/api/0326-Entity-powdered-snow-API.patch similarity index 100% rename from patches/api/0327-Entity-powdered-snow-API.patch rename to patches/api/0326-Entity-powdered-snow-API.patch diff --git a/patches/api/0328-Add-API-for-item-entity-health.patch b/patches/api/0327-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/api/0328-Add-API-for-item-entity-health.patch rename to patches/api/0327-Add-API-for-item-entity-health.patch diff --git a/patches/api/0329-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0328-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/api/0329-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/api/0328-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/api/0330-Bucketable-API.patch b/patches/api/0329-Bucketable-API.patch similarity index 100% rename from patches/api/0330-Bucketable-API.patch rename to patches/api/0329-Bucketable-API.patch diff --git a/patches/api/0331-System-prop-for-default-config-comment-parsing.patch b/patches/api/0330-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/api/0331-System-prop-for-default-config-comment-parsing.patch rename to patches/api/0330-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/api/0332-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0331-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/api/0332-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/api/0331-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/api/0333-Multiple-Entries-with-Scoreboards.patch b/patches/api/0332-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/api/0333-Multiple-Entries-with-Scoreboards.patch rename to patches/api/0332-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/api/0334-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0333-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/api/0334-Warn-on-strange-EventHandler-return-types.patch rename to patches/api/0333-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/api/0335-Multi-Block-Change-API.patch b/patches/api/0334-Multi-Block-Change-API.patch similarity index 100% rename from patches/api/0335-Multi-Block-Change-API.patch rename to patches/api/0334-Multi-Block-Change-API.patch diff --git a/patches/api/0336-Fix-NotePlayEvent.patch b/patches/api/0335-Fix-NotePlayEvent.patch similarity index 100% rename from patches/api/0336-Fix-NotePlayEvent.patch rename to patches/api/0335-Fix-NotePlayEvent.patch diff --git a/patches/api/0337-Freeze-Tick-Lock-API.patch b/patches/api/0336-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/api/0337-Freeze-Tick-Lock-API.patch rename to patches/api/0336-Freeze-Tick-Lock-API.patch diff --git a/patches/api/0338-Dolphin-API.patch b/patches/api/0337-Dolphin-API.patch similarity index 100% rename from patches/api/0338-Dolphin-API.patch rename to patches/api/0337-Dolphin-API.patch diff --git a/patches/api/0339-More-PotionEffectType-API.patch b/patches/api/0338-More-PotionEffectType-API.patch similarity index 100% rename from patches/api/0339-More-PotionEffectType-API.patch rename to patches/api/0338-More-PotionEffectType-API.patch diff --git a/patches/api/0340-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0339-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/api/0340-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/api/0339-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/api/0341-Implement-regenerateChunk.patch b/patches/api/0340-Implement-regenerateChunk.patch similarity index 100% rename from patches/api/0341-Implement-regenerateChunk.patch rename to patches/api/0340-Implement-regenerateChunk.patch diff --git a/patches/api/0342-Add-GameEvent-tags.patch b/patches/api/0341-Add-GameEvent-tags.patch similarity index 100% rename from patches/api/0342-Add-GameEvent-tags.patch rename to patches/api/0341-Add-GameEvent-tags.patch diff --git a/patches/api/0343-Furnace-RecipesUsed-API.patch b/patches/api/0342-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/api/0343-Furnace-RecipesUsed-API.patch rename to patches/api/0342-Furnace-RecipesUsed-API.patch diff --git a/patches/api/0344-Configurable-sculk-sensor-listener-range.patch b/patches/api/0343-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/api/0344-Configurable-sculk-sensor-listener-range.patch rename to patches/api/0343-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/api/0345-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0344-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/api/0345-Add-missing-block-data-mins-and-maxes.patch rename to patches/api/0344-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/api/0346-Custom-Potion-Mixes.patch b/patches/api/0345-Custom-Potion-Mixes.patch similarity index 100% rename from patches/api/0346-Custom-Potion-Mixes.patch rename to patches/api/0345-Custom-Potion-Mixes.patch diff --git a/patches/api/0347-Expose-furnace-minecart-push-values.patch b/patches/api/0346-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/api/0347-Expose-furnace-minecart-push-values.patch rename to patches/api/0346-Expose-furnace-minecart-push-values.patch diff --git a/patches/api/0348-More-Projectile-API.patch b/patches/api/0347-More-Projectile-API.patch similarity index 100% rename from patches/api/0348-More-Projectile-API.patch rename to patches/api/0347-More-Projectile-API.patch diff --git a/patches/api/0349-Add-getComputedBiome-API.patch b/patches/api/0348-Add-getComputedBiome-API.patch similarity index 100% rename from patches/api/0349-Add-getComputedBiome-API.patch rename to patches/api/0348-Add-getComputedBiome-API.patch diff --git a/patches/api/0350-Add-enchantWithLevels-API.patch b/patches/api/0349-Add-enchantWithLevels-API.patch similarity index 100% rename from patches/api/0350-Add-enchantWithLevels-API.patch rename to patches/api/0349-Add-enchantWithLevels-API.patch diff --git a/patches/api/0351-Add-TameableDeathMessageEvent.patch b/patches/api/0350-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/api/0351-Add-TameableDeathMessageEvent.patch rename to patches/api/0350-Add-TameableDeathMessageEvent.patch diff --git a/patches/api/0352-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0351-Allow-to-change-the-podium-of-the-EnderDragon.patch similarity index 100% rename from patches/api/0352-Allow-to-change-the-podium-of-the-EnderDragon.patch rename to patches/api/0351-Allow-to-change-the-podium-of-the-EnderDragon.patch diff --git a/patches/api/0353-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0352-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch similarity index 100% rename from patches/api/0353-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch rename to patches/api/0352-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch diff --git a/patches/api/0354-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0353-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/api/0354-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/api/0353-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/api/0355-WorldCreator-keepSpawnLoaded.patch b/patches/api/0354-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/api/0355-WorldCreator-keepSpawnLoaded.patch rename to patches/api/0354-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/api/0356-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0355-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/api/0356-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/api/0355-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/api/0357-Add-PlayerStopUsingItemEvent.patch b/patches/api/0356-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/api/0357-Add-PlayerStopUsingItemEvent.patch rename to patches/api/0356-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/api/0358-Expand-FallingBlock-API.patch b/patches/api/0357-Expand-FallingBlock-API.patch similarity index 100% rename from patches/api/0358-Expand-FallingBlock-API.patch rename to patches/api/0357-Expand-FallingBlock-API.patch diff --git a/patches/api/0359-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0358-Add-method-isTickingWorlds-to-Bukkit.patch similarity index 100% rename from patches/api/0359-Add-method-isTickingWorlds-to-Bukkit.patch rename to patches/api/0358-Add-method-isTickingWorlds-to-Bukkit.patch diff --git a/patches/api/0360-Add-WardenAngerChangeEvent.patch b/patches/api/0359-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/api/0360-Add-WardenAngerChangeEvent.patch rename to patches/api/0359-Add-WardenAngerChangeEvent.patch diff --git a/patches/api/0361-Nameable-Banner-API.patch b/patches/api/0360-Nameable-Banner-API.patch similarity index 100% rename from patches/api/0361-Nameable-Banner-API.patch rename to patches/api/0360-Nameable-Banner-API.patch diff --git a/patches/api/0362-Add-Player-getFishHook.patch b/patches/api/0361-Add-Player-getFishHook.patch similarity index 100% rename from patches/api/0362-Add-Player-getFishHook.patch rename to patches/api/0361-Add-Player-getFishHook.patch diff --git a/patches/api/0363-More-Teleport-API.patch b/patches/api/0362-More-Teleport-API.patch similarity index 100% rename from patches/api/0363-More-Teleport-API.patch rename to patches/api/0362-More-Teleport-API.patch diff --git a/patches/api/0364-Add-EntityPortalReadyEvent.patch b/patches/api/0363-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/api/0364-Add-EntityPortalReadyEvent.patch rename to patches/api/0363-Add-EntityPortalReadyEvent.patch diff --git a/patches/api/0365-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0364-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/api/0365-Custom-Chat-Completion-Suggestions-API.patch rename to patches/api/0364-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/api/0366-Collision-API.patch b/patches/api/0365-Collision-API.patch similarity index 100% rename from patches/api/0366-Collision-API.patch rename to patches/api/0365-Collision-API.patch diff --git a/patches/api/0367-Block-Ticking-API.patch b/patches/api/0366-Block-Ticking-API.patch similarity index 100% rename from patches/api/0367-Block-Ticking-API.patch rename to patches/api/0366-Block-Ticking-API.patch diff --git a/patches/api/0368-Add-NamespacedKey-biome-methods.patch b/patches/api/0367-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/api/0368-Add-NamespacedKey-biome-methods.patch rename to patches/api/0367-Add-NamespacedKey-biome-methods.patch diff --git a/patches/api/0369-Also-load-resources-from-LibraryLoader.patch b/patches/api/0368-Also-load-resources-from-LibraryLoader.patch similarity index 100% rename from patches/api/0369-Also-load-resources-from-LibraryLoader.patch rename to patches/api/0368-Also-load-resources-from-LibraryLoader.patch diff --git a/patches/api/0370-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0369-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/api/0370-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/api/0369-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/api/0371-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0370-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/api/0371-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/api/0370-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/api/0372-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0371-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch similarity index 100% rename from patches/api/0372-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch rename to patches/api/0371-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch diff --git a/patches/api/0373-Add-getDrops-to-BlockState.patch b/patches/api/0372-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/api/0373-Add-getDrops-to-BlockState.patch rename to patches/api/0372-Add-getDrops-to-BlockState.patch diff --git a/patches/api/0374-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0373-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/api/0374-Add-PlayerInventorySlotChangeEvent.patch rename to patches/api/0373-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/api/0375-Elder-Guardian-appearance-API.patch b/patches/api/0374-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/api/0375-Elder-Guardian-appearance-API.patch rename to patches/api/0374-Elder-Guardian-appearance-API.patch diff --git a/patches/api/0376-Allow-changing-bed-s-occupied-property.patch b/patches/api/0375-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/api/0376-Allow-changing-bed-s-occupied-property.patch rename to patches/api/0375-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/api/0377-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0376-Add-EquipmentSlot-convenience-methods.patch similarity index 100% rename from patches/api/0377-Add-EquipmentSlot-convenience-methods.patch rename to patches/api/0376-Add-EquipmentSlot-convenience-methods.patch diff --git a/patches/api/0378-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0377-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch similarity index 100% rename from patches/api/0378-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch rename to patches/api/0377-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch diff --git a/patches/api/0379-Add-entity-knockback-API.patch b/patches/api/0378-Add-entity-knockback-API.patch similarity index 100% rename from patches/api/0379-Add-entity-knockback-API.patch rename to patches/api/0378-Add-entity-knockback-API.patch diff --git a/patches/api/0380-Added-EntityToggleSitEvent.patch b/patches/api/0379-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/api/0380-Added-EntityToggleSitEvent.patch rename to patches/api/0379-Added-EntityToggleSitEvent.patch diff --git a/patches/api/0381-Add-Moving-Piston-API.patch b/patches/api/0380-Add-Moving-Piston-API.patch similarity index 100% rename from patches/api/0381-Add-Moving-Piston-API.patch rename to patches/api/0380-Add-Moving-Piston-API.patch diff --git a/patches/api/0382-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0381-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/api/0382-Add-PrePlayerAttackEntityEvent.patch rename to patches/api/0381-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/api/0383-Add-Player-Warden-Warning-API.patch b/patches/api/0382-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/api/0383-Add-Player-Warden-Warning-API.patch rename to patches/api/0382-Add-Player-Warden-Warning-API.patch diff --git a/patches/api/0384-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0383-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/api/0384-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/api/0383-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/api/0385-Add-paper-dumplisteners-command.patch b/patches/api/0384-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/api/0385-Add-paper-dumplisteners-command.patch rename to patches/api/0384-Add-paper-dumplisteners-command.patch diff --git a/patches/api/0386-ItemStack-damage-API.patch b/patches/api/0385-ItemStack-damage-API.patch similarity index 100% rename from patches/api/0386-ItemStack-damage-API.patch rename to patches/api/0385-ItemStack-damage-API.patch diff --git a/patches/api/0387-Add-Tick-TemporalUnit.patch b/patches/api/0386-Add-Tick-TemporalUnit.patch similarity index 100% rename from patches/api/0387-Add-Tick-TemporalUnit.patch rename to patches/api/0386-Add-Tick-TemporalUnit.patch diff --git a/patches/api/0388-Friction-API.patch b/patches/api/0387-Friction-API.patch similarity index 100% rename from patches/api/0388-Friction-API.patch rename to patches/api/0387-Friction-API.patch diff --git a/patches/api/0389-Player-Entity-Tracking-Events.patch b/patches/api/0388-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/api/0389-Player-Entity-Tracking-Events.patch rename to patches/api/0388-Player-Entity-Tracking-Events.patch diff --git a/patches/api/0390-Add-missing-Fluid-type.patch b/patches/api/0389-Add-missing-Fluid-type.patch similarity index 100% rename from patches/api/0390-Add-missing-Fluid-type.patch rename to patches/api/0389-Add-missing-Fluid-type.patch diff --git a/patches/api/0391-fix-Instruments.patch b/patches/api/0390-fix-Instruments.patch similarity index 100% rename from patches/api/0391-fix-Instruments.patch rename to patches/api/0390-fix-Instruments.patch diff --git a/patches/api/0392-Add-BlockLockCheckEvent.patch b/patches/api/0391-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/api/0392-Add-BlockLockCheckEvent.patch rename to patches/api/0391-Add-BlockLockCheckEvent.patch diff --git a/patches/api/0393-Add-Sneaking-API-for-Entities.patch b/patches/api/0392-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/api/0393-Add-Sneaking-API-for-Entities.patch rename to patches/api/0392-Add-Sneaking-API-for-Entities.patch diff --git a/patches/api/0394-Improve-PortalEvents.patch b/patches/api/0393-Improve-PortalEvents.patch similarity index 100% rename from patches/api/0394-Improve-PortalEvents.patch rename to patches/api/0393-Improve-PortalEvents.patch diff --git a/patches/api/0395-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/api/0394-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/api/0395-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/api/0394-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/api/0396-Flying-Fall-Damage-API.patch b/patches/api/0395-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/api/0396-Flying-Fall-Damage-API.patch rename to patches/api/0395-Flying-Fall-Damage-API.patch diff --git a/patches/api/0397-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0396-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch similarity index 100% rename from patches/api/0397-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch rename to patches/api/0396-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch diff --git a/patches/api/0398-Win-Screen-API.patch b/patches/api/0397-Win-Screen-API.patch similarity index 100% rename from patches/api/0398-Win-Screen-API.patch rename to patches/api/0397-Win-Screen-API.patch diff --git a/patches/api/0399-Add-Entity-Body-Yaw-API.patch b/patches/api/0398-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/api/0399-Add-Entity-Body-Yaw-API.patch rename to patches/api/0398-Add-Entity-Body-Yaw-API.patch diff --git a/patches/api/0400-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0399-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch similarity index 100% rename from patches/api/0400-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch rename to patches/api/0399-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch diff --git a/patches/api/0401-Add-EntityFertilizeEggEvent.patch b/patches/api/0400-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/api/0401-Add-EntityFertilizeEggEvent.patch rename to patches/api/0400-Add-EntityFertilizeEggEvent.patch diff --git a/patches/api/0402-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0401-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/api/0402-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/api/0401-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/api/0403-Add-Shearable-API.patch b/patches/api/0402-Add-Shearable-API.patch similarity index 100% rename from patches/api/0403-Add-Shearable-API.patch rename to patches/api/0402-Add-Shearable-API.patch diff --git a/patches/api/0404-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0403-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/api/0404-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/api/0403-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/api/0405-Add-Mob-Experience-reward-API.patch b/patches/api/0404-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/api/0405-Add-Mob-Experience-reward-API.patch rename to patches/api/0404-Add-Mob-Experience-reward-API.patch diff --git a/patches/api/0406-Expand-PlayerItemMendEvent.patch b/patches/api/0405-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/api/0406-Expand-PlayerItemMendEvent.patch rename to patches/api/0405-Expand-PlayerItemMendEvent.patch diff --git a/patches/api/0407-Add-transient-modifier-API.patch b/patches/api/0406-Add-transient-modifier-API.patch similarity index 100% rename from patches/api/0407-Add-transient-modifier-API.patch rename to patches/api/0406-Add-transient-modifier-API.patch diff --git a/patches/api/0408-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0407-Properly-remove-the-experimental-smithing-inventory-.patch similarity index 100% rename from patches/api/0408-Properly-remove-the-experimental-smithing-inventory-.patch rename to patches/api/0407-Properly-remove-the-experimental-smithing-inventory-.patch diff --git a/patches/api/0409-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0408-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/api/0409-Add-method-to-remove-all-active-potion-effects.patch rename to patches/api/0408-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/api/0410-Folia-scheduler-and-owned-region-API.patch b/patches/api/0409-Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/api/0410-Folia-scheduler-and-owned-region-API.patch rename to patches/api/0409-Folia-scheduler-and-owned-region-API.patch diff --git a/patches/api/0411-Add-event-for-player-editing-sign.patch b/patches/api/0410-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/api/0411-Add-event-for-player-editing-sign.patch rename to patches/api/0410-Add-event-for-player-editing-sign.patch diff --git a/patches/api/0412-Add-Sign-getInteractableSideFor.patch b/patches/api/0411-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/api/0412-Add-Sign-getInteractableSideFor.patch rename to patches/api/0411-Add-Sign-getInteractableSideFor.patch diff --git a/patches/api/0413-Fix-BanList-API.patch b/patches/api/0412-Fix-BanList-API.patch similarity index 100% rename from patches/api/0413-Fix-BanList-API.patch rename to patches/api/0412-Fix-BanList-API.patch diff --git a/patches/api/0414-Add-whitelist-events.patch b/patches/api/0413-Add-whitelist-events.patch similarity index 100% rename from patches/api/0414-Add-whitelist-events.patch rename to patches/api/0413-Add-whitelist-events.patch diff --git a/patches/api/0415-API-for-updating-recipes-on-clients.patch b/patches/api/0414-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/api/0415-API-for-updating-recipes-on-clients.patch rename to patches/api/0414-API-for-updating-recipes-on-clients.patch diff --git a/patches/api/0416-Add-PlayerFailMoveEvent.patch b/patches/api/0415-Add-PlayerFailMoveEvent.patch similarity index 100% rename from patches/api/0416-Add-PlayerFailMoveEvent.patch rename to patches/api/0415-Add-PlayerFailMoveEvent.patch diff --git a/patches/api/0417-Fix-custom-statistic-criteria-creation.patch b/patches/api/0416-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/api/0417-Fix-custom-statistic-criteria-creation.patch rename to patches/api/0416-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/api/0418-SculkCatalyst-bloom-API.patch b/patches/api/0417-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/api/0418-SculkCatalyst-bloom-API.patch rename to patches/api/0417-SculkCatalyst-bloom-API.patch diff --git a/patches/api/0419-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0418-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/api/0419-API-for-an-entity-s-scoreboard-name.patch rename to patches/api/0418-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/api/0420-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0419-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/api/0420-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/api/0419-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/api/0421-Add-Listing-API-for-Player.patch b/patches/api/0420-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/api/0421-Add-Listing-API-for-Player.patch rename to patches/api/0420-Add-Listing-API-for-Player.patch diff --git a/patches/api/0422-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0421-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/api/0422-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/api/0421-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/api/0423-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0422-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/api/0423-Fix-NPE-on-Boat-getStatus.patch rename to patches/api/0422-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/api/0424-Expand-Pose-API.patch b/patches/api/0423-Expand-Pose-API.patch similarity index 100% rename from patches/api/0424-Expand-Pose-API.patch rename to patches/api/0423-Expand-Pose-API.patch diff --git a/patches/api/0425-MerchantRecipe-add-copy-constructor.patch b/patches/api/0424-MerchantRecipe-add-copy-constructor.patch similarity index 100% rename from patches/api/0425-MerchantRecipe-add-copy-constructor.patch rename to patches/api/0424-MerchantRecipe-add-copy-constructor.patch diff --git a/patches/api/0426-More-DragonBattle-API.patch b/patches/api/0425-More-DragonBattle-API.patch similarity index 100% rename from patches/api/0426-More-DragonBattle-API.patch rename to patches/api/0425-More-DragonBattle-API.patch diff --git a/patches/api/0427-Add-PlayerPickItemEvent.patch b/patches/api/0426-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/api/0427-Add-PlayerPickItemEvent.patch rename to patches/api/0426-Add-PlayerPickItemEvent.patch diff --git a/patches/api/0428-Allow-trident-custom-damage.patch b/patches/api/0427-Allow-trident-custom-damage.patch similarity index 100% rename from patches/api/0428-Allow-trident-custom-damage.patch rename to patches/api/0427-Allow-trident-custom-damage.patch diff --git a/patches/api/0429-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0428-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/api/0429-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/api/0428-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/api/0430-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0429-Limit-setBurnTime-to-valid-short-values.patch similarity index 100% rename from patches/api/0430-Limit-setBurnTime-to-valid-short-values.patch rename to patches/api/0429-Limit-setBurnTime-to-valid-short-values.patch diff --git a/patches/api/0431-Add-OfflinePlayer-isConnected.patch b/patches/api/0430-Add-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/api/0431-Add-OfflinePlayer-isConnected.patch rename to patches/api/0430-Add-OfflinePlayer-isConnected.patch diff --git a/patches/api/0432-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0431-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/api/0432-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/api/0431-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/api/0433-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0432-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/api/0433-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/api/0432-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/api/0434-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0433-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch similarity index 100% rename from patches/api/0434-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch rename to patches/api/0433-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch diff --git a/patches/api/0435-Add-player-idle-duration-API.patch b/patches/api/0434-Add-player-idle-duration-API.patch similarity index 100% rename from patches/api/0435-Add-player-idle-duration-API.patch rename to patches/api/0434-Add-player-idle-duration-API.patch diff --git a/patches/api/0436-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0435-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/api/0436-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/api/0435-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/api/0437-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0436-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/api/0437-Add-predicate-for-blocks-when-raytracing.patch rename to patches/api/0436-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/api/0438-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0437-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/api/0438-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/api/0437-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/api/0439-Add-UUID-attribute-modifier-API.patch b/patches/api/0438-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/api/0439-Add-UUID-attribute-modifier-API.patch rename to patches/api/0438-Add-UUID-attribute-modifier-API.patch diff --git a/patches/api/0440-Expand-LingeringPotion-API.patch b/patches/api/0439-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/api/0440-Expand-LingeringPotion-API.patch rename to patches/api/0439-Expand-LingeringPotion-API.patch diff --git a/patches/api/0441-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0440-Remove-unnecessary-durability-check-in-ItemStack-isS.patch similarity index 100% rename from patches/api/0441-Remove-unnecessary-durability-check-in-ItemStack-isS.patch rename to patches/api/0440-Remove-unnecessary-durability-check-in-ItemStack-isS.patch diff --git a/patches/api/0442-Add-Structure-check-API.patch b/patches/api/0441-Add-Structure-check-API.patch similarity index 100% rename from patches/api/0442-Add-Structure-check-API.patch rename to patches/api/0441-Add-Structure-check-API.patch diff --git a/patches/api/0443-add-missing-Experimental-annotations.patch b/patches/api/0442-add-missing-Experimental-annotations.patch similarity index 100% rename from patches/api/0443-add-missing-Experimental-annotations.patch rename to patches/api/0442-add-missing-Experimental-annotations.patch diff --git a/patches/api/0444-Add-more-scoreboard-API.patch b/patches/api/0443-Add-more-scoreboard-API.patch similarity index 100% rename from patches/api/0444-Add-more-scoreboard-API.patch rename to patches/api/0443-Add-more-scoreboard-API.patch diff --git a/patches/api/0445-Improve-Registry.patch b/patches/api/0444-Improve-Registry.patch similarity index 100% rename from patches/api/0445-Improve-Registry.patch rename to patches/api/0444-Improve-Registry.patch diff --git a/patches/api/0446-Add-experience-points-API.patch b/patches/api/0445-Add-experience-points-API.patch similarity index 100% rename from patches/api/0446-Add-experience-points-API.patch rename to patches/api/0445-Add-experience-points-API.patch diff --git a/patches/api/0447-Add-missing-InventoryType.patch b/patches/api/0446-Add-missing-InventoryType.patch similarity index 100% rename from patches/api/0447-Add-missing-InventoryType.patch rename to patches/api/0446-Add-missing-InventoryType.patch diff --git a/patches/api/0448-Add-drops-to-shear-events.patch b/patches/api/0447-Add-drops-to-shear-events.patch similarity index 100% rename from patches/api/0448-Add-drops-to-shear-events.patch rename to patches/api/0447-Add-drops-to-shear-events.patch diff --git a/patches/api/0449-Add-HiddenPotionEffect-API.patch b/patches/api/0448-Add-HiddenPotionEffect-API.patch similarity index 100% rename from patches/api/0449-Add-HiddenPotionEffect-API.patch rename to patches/api/0448-Add-HiddenPotionEffect-API.patch diff --git a/patches/api/0450-Add-PlayerShieldDisableEvent.patch b/patches/api/0449-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/api/0450-Add-PlayerShieldDisableEvent.patch rename to patches/api/0449-Add-PlayerShieldDisableEvent.patch diff --git a/patches/api/0451-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0450-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch similarity index 92% rename from patches/api/0451-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch rename to patches/api/0450-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch index 742314fff..42c1f7615 100644 --- a/patches/api/0451-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch +++ b/patches/api/0450-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Return null for empty String in NamespacedKey.fromString diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java -index 8ac72cb0b05e2c493d98310f2e87c3714d15c5e3..97cf6b6acdd71740b75658f14ca5cabbacb108d4 100644 +index 5a2032fde327be45b44fd6aa99808fe7c3054e1b..334a107b991b7edda57f89ada3651ed72f98bffc 100644 --- a/src/main/java/org/bukkit/NamespacedKey.java +++ b/src/main/java/org/bukkit/NamespacedKey.java -@@ -90,7 +90,7 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des +@@ -90,7 +90,7 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key { // Pap this.key = key; String string = toString(); @@ -17,7 +17,7 @@ index 8ac72cb0b05e2c493d98310f2e87c3714d15c5e3..97cf6b6acdd71740b75658f14ca5cabb } /** -@@ -117,7 +117,7 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des +@@ -117,7 +117,7 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key { // Pap Preconditions.checkArgument(isValidKey(this.key), "Invalid key. Must be [a-z0-9/._-]: %s", this.key); String string = toString(); @@ -26,7 +26,7 @@ index 8ac72cb0b05e2c493d98310f2e87c3714d15c5e3..97cf6b6acdd71740b75658f14ca5cabb } @NotNull -@@ -206,7 +206,10 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des +@@ -204,7 +204,10 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key { // Pap */ @Nullable public static NamespacedKey fromString(@NotNull String string, @Nullable Plugin defaultNamespace) { diff --git a/patches/api/0452-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0451-Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/api/0452-Add-BlockStateMeta-clearBlockState.patch rename to patches/api/0451-Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/api/0453-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0452-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/api/0453-Expose-LootTable-of-DecoratedPot.patch rename to patches/api/0452-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/api/0454-Add-ShulkerDuplicateEvent.patch b/patches/api/0453-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/api/0454-Add-ShulkerDuplicateEvent.patch rename to patches/api/0453-Add-ShulkerDuplicateEvent.patch diff --git a/patches/api/0455-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0454-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/api/0455-Add-api-for-spawn-egg-texture-colors.patch rename to patches/api/0454-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/api/0456-Add-Lifecycle-Event-system.patch b/patches/api/0455-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/api/0456-Add-Lifecycle-Event-system.patch rename to patches/api/0455-Add-Lifecycle-Event-system.patch diff --git a/patches/api/0457-ItemStack-Tooltip-API.patch b/patches/api/0456-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/api/0457-ItemStack-Tooltip-API.patch rename to patches/api/0456-ItemStack-Tooltip-API.patch diff --git a/patches/api/0458-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0457-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/api/0458-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/api/0457-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/api/0459-Add-FluidState-API.patch b/patches/api/0458-Add-FluidState-API.patch similarity index 100% rename from patches/api/0459-Add-FluidState-API.patch rename to patches/api/0458-Add-FluidState-API.patch diff --git a/patches/api/0460-add-number-format-api.patch b/patches/api/0459-add-number-format-api.patch similarity index 100% rename from patches/api/0460-add-number-format-api.patch rename to patches/api/0459-add-number-format-api.patch diff --git a/patches/api/0461-improve-BanList-types.patch b/patches/api/0460-improve-BanList-types.patch similarity index 100% rename from patches/api/0461-improve-BanList-types.patch rename to patches/api/0460-improve-BanList-types.patch diff --git a/patches/api/0462-Suspicious-Effect-Entry-API.patch b/patches/api/0461-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/api/0462-Suspicious-Effect-Entry-API.patch rename to patches/api/0461-Suspicious-Effect-Entry-API.patch diff --git a/patches/api/0463-Fix-DamageSource-API.patch b/patches/api/0462-Fix-DamageSource-API.patch similarity index 100% rename from patches/api/0463-Fix-DamageSource-API.patch rename to patches/api/0462-Fix-DamageSource-API.patch diff --git a/patches/api/0464-Expanded-Hopper-API.patch b/patches/api/0463-Expanded-Hopper-API.patch similarity index 100% rename from patches/api/0464-Expanded-Hopper-API.patch rename to patches/api/0463-Expanded-Hopper-API.patch diff --git a/patches/api/0465-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0464-Clone-mutables-to-prevent-unexpected-issues.patch similarity index 100% rename from patches/api/0465-Clone-mutables-to-prevent-unexpected-issues.patch rename to patches/api/0464-Clone-mutables-to-prevent-unexpected-issues.patch diff --git a/patches/api/0466-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0465-Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/api/0466-Add-BlockBreakProgressUpdateEvent.patch rename to patches/api/0465-Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/api/0467-Deprecate-ItemStack-setType.patch b/patches/api/0466-Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/api/0467-Deprecate-ItemStack-setType.patch rename to patches/api/0466-Deprecate-ItemStack-setType.patch diff --git a/patches/api/0468-Item-Mutation-Fixes.patch b/patches/api/0467-Item-Mutation-Fixes.patch similarity index 100% rename from patches/api/0468-Item-Mutation-Fixes.patch rename to patches/api/0467-Item-Mutation-Fixes.patch diff --git a/patches/api/0469-API-for-checking-sent-chunks.patch b/patches/api/0468-API-for-checking-sent-chunks.patch similarity index 100% rename from patches/api/0469-API-for-checking-sent-chunks.patch rename to patches/api/0468-API-for-checking-sent-chunks.patch diff --git a/patches/api/0470-Add-CartographyItemEvent.patch b/patches/api/0469-Add-CartographyItemEvent.patch similarity index 100% rename from patches/api/0470-Add-CartographyItemEvent.patch rename to patches/api/0469-Add-CartographyItemEvent.patch diff --git a/patches/api/0471-More-Raid-API.patch b/patches/api/0470-More-Raid-API.patch similarity index 100% rename from patches/api/0471-More-Raid-API.patch rename to patches/api/0470-More-Raid-API.patch diff --git a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch index 4d1344949..d8dd3dfa4 100644 --- a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch +++ b/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch @@ -14,7 +14,7 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 831e63386d110fe5581526dc142bd630aca39246..1fc04a8b10ad775e46f86ecd045073dc24d28763 100644 +index 831e63386d110fe5581526dc142bd630aca39246..40a1b3a5dde30c1e47c2e0419cca23fc25185419 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1624,7 +1624,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -29,7 +29,7 @@ index 831e63386d110fe5581526dc142bd630aca39246..1fc04a8b10ad775e46f86ecd045073dc + final var stackEntry = net.minecraft.world.item.enchantment.EnchantmentHelper + .getRandomItemWith(net.minecraft.world.item.enchantment.Enchantments.MENDING, handle); + final net.minecraft.world.item.ItemStack itemstack = stackEntry != null ? stackEntry.getValue() : net.minecraft.world.item.ItemStack.EMPTY; -+ if (!itemstack.isEmpty() && itemstack.getItem().components().has(net.minecraft.core.component.DataComponents.MAX_STACK_SIZE)) { ++ if (!itemstack.isEmpty() && itemstack.getItem().components().has(net.minecraft.core.component.DataComponents.MAX_DAMAGE)) { + net.minecraft.world.entity.ExperienceOrb orb = net.minecraft.world.entity.EntityType.EXPERIENCE_ORB.create(handle.level()); + orb.value = amount; + orb.spawnReason = org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM; diff --git a/patches/server/0183-Player.setPlayerProfile-API.patch b/patches/server/0183-Player.setPlayerProfile-API.patch index 06079d32d..4da9ac899 100644 --- a/patches/server/0183-Player.setPlayerProfile-API.patch +++ b/patches/server/0183-Player.setPlayerProfile-API.patch @@ -77,7 +77,7 @@ index 818df09e9245b5d89b4180b1eaa51470b7539341..461656e1cb095243bfe7a9ee2906e5b0 public Server getServer() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1fc04a8b10ad775e46f86ecd045073dc24d28763..5273d0ff76ce68683b4d27576b93bd330516ba5f 100644 +index 40a1b3a5dde30c1e47c2e0419cca23fc25185419..981bdd5543a41517f5ead64cdce299cd3725e76c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -246,11 +246,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0188-Flag-to-disable-the-channel-limit.patch b/patches/server/0188-Flag-to-disable-the-channel-limit.patch index a938e9a10..8a6cf594d 100644 --- a/patches/server/0188-Flag-to-disable-the-channel-limit.patch +++ b/patches/server/0188-Flag-to-disable-the-channel-limit.patch @@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs. provide an optional flag to disable this check, at your own risk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5273d0ff76ce68683b4d27576b93bd330516ba5f..7e9c65689520b9bf5e0491eab2557705f6378121 100644 +index 981bdd5543a41517f5ead64cdce299cd3725e76c..a17bbb4b781870cd9a32a3a6e797ba465808d74f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -206,6 +206,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0215-InventoryCloseEvent-Reason-API.patch b/patches/server/0215-InventoryCloseEvent-Reason-API.patch index b7450dc81..9d216e99c 100644 --- a/patches/server/0215-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0215-InventoryCloseEvent-Reason-API.patch @@ -165,7 +165,7 @@ index dd3377a4f69e5ac10905e52d0eecc2427e72d856..c79607a2f45b7a487a95cf98b9b0eb6b @Override public boolean isBlocking() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7e9c65689520b9bf5e0491eab2557705f6378121..8a91a0d5902c4cb0eed804cdae9a8602775d45bd 100644 +index a17bbb4b781870cd9a32a3a6e797ba465808d74f..f161f564a682bf7c5fc9f3ffa0df8fcaa7c2d86c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1260,7 +1260,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0249-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0249-Expose-attack-cooldown-methods-for-Player.patch index 6c7a6c6d7..d64894ccb 100644 --- a/patches/server/0249-Expose-attack-cooldown-methods-for-Player.patch +++ b/patches/server/0249-Expose-attack-cooldown-methods-for-Player.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8a91a0d5902c4cb0eed804cdae9a8602775d45bd..a7ae7f5e9e9dc3e11d2d389455f276c17b525eeb 100644 +index f161f564a682bf7c5fc9f3ffa0df8fcaa7c2d86c..8e294b2583b7a26c463d6f12d3c42c0da83741f8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2961,6 +2961,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0250-Improve-death-events.patch b/patches/server/0250-Improve-death-events.patch index 69ae32e23..7c8c5577d 100644 --- a/patches/server/0250-Improve-death-events.patch +++ b/patches/server/0250-Improve-death-events.patch @@ -427,7 +427,7 @@ index 042968ff848da74be0c9fcf9bac3d0adfb135802..cb3729509e50fed64b17f16797825c1d this.gameEvent(GameEvent.ENTITY_DIE); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a7ae7f5e9e9dc3e11d2d389455f276c17b525eeb..50c5c3bd3c4c368a2e15f5881cb93994c31db0d7 100644 +index 8e294b2583b7a26c463d6f12d3c42c0da83741f8..bca943e23d4869dbab6988220431e7a97e02258b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2502,7 +2502,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0280-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0280-Replace-OfflinePlayer-getLastPlayed.patch index 136720ca5..a22497299 100644 --- a/patches/server/0280-Replace-OfflinePlayer-getLastPlayed.patch +++ b/patches/server/0280-Replace-OfflinePlayer-getLastPlayed.patch @@ -106,7 +106,7 @@ index 461656e1cb095243bfe7a9ee2906e5b00574ae78..411b280ac3e27e72091db813c0c9b69b public Location getLastDeathLocation() { if (this.getData().contains("LastDeathLocation", 10)) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 50c5c3bd3c4c368a2e15f5881cb93994c31db0d7..9b23e3a4c9d6b8c83bdf6ef3939ad0fdd4c61b65 100644 +index bca943e23d4869dbab6988220431e7a97e02258b..02e7747ab83b7ae9a11a2a8dc48e16e1276bd952 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -207,6 +207,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0282-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0282-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch index 55391f543..6e2940f25 100644 --- a/patches/server/0282-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch +++ b/patches/server/0282-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch @@ -8,7 +8,7 @@ We just add a check to ensure that the CraftPlayer's handle is a ServerPlayer diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9b23e3a4c9d6b8c83bdf6ef3939ad0fdd4c61b65..307d8313b7d314f09201a7a958fd2027ecc31cdc 100644 +index 02e7747ab83b7ae9a11a2a8dc48e16e1276bd952..f60929a391f26a34ca2e13066bd0c8e87d2c2343 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -221,8 +221,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0351-Implement-Player-Client-Options-API.patch b/patches/server/0351-Implement-Player-Client-Options-API.patch index 59854c740..f8a2da768 100644 --- a/patches/server/0351-Implement-Player-Client-Options-API.patch +++ b/patches/server/0351-Implement-Player-Client-Options-API.patch @@ -136,7 +136,7 @@ index f6e4172f1c7ad38128e77e53f099e67a4c4be620..62bdc3016120271da2ca3a1f6ac46757 this.adventure$locale = java.util.Objects.requireNonNullElse(net.kyori.adventure.translation.Translator.parseLocale(this.language), java.util.Locale.US); // Paper this.requestedViewDistance = clientOptions.viewDistance(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 307d8313b7d314f09201a7a958fd2027ecc31cdc..006de686bfb22a51d5bf03e6e1ffb32a737cb49c 100644 +index f60929a391f26a34ca2e13066bd0c8e87d2c2343..348fdd1ff1f32ffa4d5c78ff42bc3983a773c658 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -650,6 +650,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0407-Brand-support.patch b/patches/server/0407-Brand-support.patch index 2bceea9e6..39c89bba3 100644 --- a/patches/server/0407-Brand-support.patch +++ b/patches/server/0407-Brand-support.patch @@ -57,7 +57,7 @@ index 96b5e033aab4e1ee090af77a871e643dbf6300a4..215da3c52dc7b9e92c23f352fa7cffc2 } catch (Exception ex) { ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 006de686bfb22a51d5bf03e6e1ffb32a737cb49c..70a9a4070d02fafdeb6545550aa72def63d9fc3c 100644 +index 348fdd1ff1f32ffa4d5c78ff42bc3983a773c658..45f1d3d15e2a8ba61f497fa8c90ca1496a59b337 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3120,6 +3120,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0450-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0450-Fix-Player-spawnParticle-x-y-z-precision-loss.patch index 6834d3823..cca20fc41 100644 --- a/patches/server/0450-Fix-Player-spawnParticle-x-y-z-precision-loss.patch +++ b/patches/server/0450-Fix-Player-spawnParticle-x-y-z-precision-loss.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 70a9a4070d02fafdeb6545550aa72def63d9fc3c..6d914f7f6d88c817be4ff6e326dc2f9708974a76 100644 +index 45f1d3d15e2a8ba61f497fa8c90ca1496a59b337..b0b101b4c0327cfc00afdb2c8919f40422110595 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2686,7 +2686,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0487-Add-sendOpLevel-API.patch b/patches/server/0487-Add-sendOpLevel-API.patch index fe59edec0..40bd209fc 100644 --- a/patches/server/0487-Add-sendOpLevel-API.patch +++ b/patches/server/0487-Add-sendOpLevel-API.patch @@ -32,7 +32,7 @@ index 505af87eaf8209437978848be1dde86f879f82f2..d5071f9f2d433706fc378f77906bb5f0 public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6d914f7f6d88c817be4ff6e326dc2f9708974a76..b9ccc0420be4c50c618e00f168f0dbfd4c3af978 100644 +index b0b101b4c0327cfc00afdb2c8919f40422110595..4b822efa702b0bb08a9122554b41c22d68d39548 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -674,6 +674,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0550-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0550-Expand-PlayerGameModeChangeEvent.patch index 4621c2eec..26fabafdc 100644 --- a/patches/server/0550-Expand-PlayerGameModeChangeEvent.patch +++ b/patches/server/0550-Expand-PlayerGameModeChangeEvent.patch @@ -145,7 +145,7 @@ index 70d5f1202c38d2b73510a8e1fe0863492384cf20..f34960b459b9dd7340fd0b8b19739f08 } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b9ccc0420be4c50c618e00f168f0dbfd4c3af978..564f3f8d8bb79b368f6f0bdefb29d084d8c952e3 100644 +index 4b822efa702b0bb08a9122554b41c22d68d39548..5a81e5a50e31c46d94d1674c8b623cf4a1a2e0ae 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1640,7 +1640,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0562-Add-PlayerKickEvent-causes.patch b/patches/server/0562-Add-PlayerKickEvent-causes.patch index 60208417b..9551550f0 100644 --- a/patches/server/0562-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0562-Add-PlayerKickEvent-causes.patch @@ -477,7 +477,7 @@ index f472dea0bd4f834c0c8f0aa59ae7cdae082b14af..2fa51c3a70f43cd23b8f494fc643d66c } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 564f3f8d8bb79b368f6f0bdefb29d084d8c952e3..13505e351a7c4526199422d72316cb5964c2e791 100644 +index 5a81e5a50e31c46d94d1674c8b623cf4a1a2e0ae..ff4ec105c2fd4e1bebf9503d4d073fd9135342c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -632,7 +632,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0591-Add-PlayerSetSpawnEvent.patch b/patches/server/0591-Add-PlayerSetSpawnEvent.patch index 82d96eee7..421b77f76 100644 --- a/patches/server/0591-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0591-Add-PlayerSetSpawnEvent.patch @@ -187,7 +187,7 @@ index e18726915d1491d74084827afd9978800aecb644..a4a90df0b500fb440226b07462faaa87 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 13505e351a7c4526199422d72316cb5964c2e791..7013880a5eafcb6a16fb1b3f22b0ed0e44018750 100644 +index ff4ec105c2fd4e1bebf9503d4d073fd9135342c8..60147478bc40bc03a1622895074cf910ef6b94f4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1399,9 +1399,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0676-Multi-Block-Change-API-Implementation.patch b/patches/server/0676-Multi-Block-Change-API-Implementation.patch index 26e2afbd8..19cdec2cc 100644 --- a/patches/server/0676-Multi-Block-Change-API-Implementation.patch +++ b/patches/server/0676-Multi-Block-Change-API-Implementation.patch @@ -24,7 +24,7 @@ index 926ff9be3d9e3f5d620e4c7ccb22b9f64865ff8c..1a37654aff9a9c86c9f7af10a1cf7213 buf.writeLong(this.sectionPos.asLong()); buf.writeVarInt(this.positions.length); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7013880a5eafcb6a16fb1b3f22b0ed0e44018750..8c3a43dbac4fc02206dc616e86aaa2438415f0dc 100644 +index 60147478bc40bc03a1622895074cf910ef6b94f4..ea3d87b425360b753af4ac7647ab296dc7a2faf0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -927,6 +927,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0746-More-Teleport-API.patch b/patches/server/0746-More-Teleport-API.patch index 94cce43f0..aec19083b 100644 --- a/patches/server/0746-More-Teleport-API.patch +++ b/patches/server/0746-More-Teleport-API.patch @@ -112,7 +112,7 @@ index 113ca1d16cb7650d72f488cdaa9e670d51dc85f0..b6fef2ca5b564c293cb602cb8e300d35 private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8c3a43dbac4fc02206dc616e86aaa2438415f0dc..4054c18df8fc2806c11b4a71a6af28cc6c06f709 100644 +index ea3d87b425360b753af4ac7647ab296dc7a2faf0..1c557d4787b3d10f222e2b11d98d43bc17dac25f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1273,13 +1273,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0751-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0751-Custom-Chat-Completion-Suggestions-API.patch index 52d453a2e..cea15717c 100644 --- a/patches/server/0751-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/server/0751-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4054c18df8fc2806c11b4a71a6af28cc6c06f709..c11a1c805b1537a4a75c558c5f9ea8f382746ddc 100644 +index 1c557d4787b3d10f222e2b11d98d43bc17dac25f..8d22621b715c46dd96f0bfa646dad08d776c5d0c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -688,6 +688,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0777-Elder-Guardian-appearance-API.patch b/patches/server/0777-Elder-Guardian-appearance-API.patch index e15b4cf88..9ed8079bb 100644 --- a/patches/server/0777-Elder-Guardian-appearance-API.patch +++ b/patches/server/0777-Elder-Guardian-appearance-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c11a1c805b1537a4a75c558c5f9ea8f382746ddc..28c7e40d91c32ec1b09109d2d5f17553da43c179 100644 +index 8d22621b715c46dd96f0bfa646dad08d776c5d0c..ad345fe407880ec7242923653e766d553a60ad24 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3279,6 +3279,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0791-Add-Player-Warden-Warning-API.patch b/patches/server/0791-Add-Player-Warden-Warning-API.patch index 64b9319d1..d60c34b4a 100644 --- a/patches/server/0791-Add-Player-Warden-Warning-API.patch +++ b/patches/server/0791-Add-Player-Warden-Warning-API.patch @@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 28c7e40d91c32ec1b09109d2d5f17553da43c179..8c1e41f1f3f2f1a4861cac9292e010adfa28cb4a 100644 +index ad345fe407880ec7242923653e766d553a60ad24..b8fcb478c40749d335636930a2a3b77dc1ef23d2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3284,6 +3284,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0804-fix-Instruments.patch b/patches/server/0804-fix-Instruments.patch index e190d2d25..00fbc807a 100644 --- a/patches/server/0804-fix-Instruments.patch +++ b/patches/server/0804-fix-Instruments.patch @@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments properly handle Player#playNote diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8c1e41f1f3f2f1a4861cac9292e010adfa28cb4a..6b217047508fc8f7f88945bbf8c5ee667e8787af 100644 +index b8fcb478c40749d335636930a2a3b77dc1ef23d2..ed8d88b169c39d28d470f738a4be5d2889ac1a92 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -765,7 +765,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0814-Flying-Fall-Damage.patch b/patches/server/0814-Flying-Fall-Damage.patch index 2a43b9de1..5cc39c618 100644 --- a/patches/server/0814-Flying-Fall-Damage.patch +++ b/patches/server/0814-Flying-Fall-Damage.patch @@ -26,7 +26,7 @@ index 761e8a0c4e1db465c18892999e86885f27ca8075..230ffd3c4541ef8979605d733b6463e3 } else { if (fallDistance >= 2.0F) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6b217047508fc8f7f88945bbf8c5ee667e8787af..ddfe12d04328602cfcb8c7a524ab29337718d594 100644 +index ed8d88b169c39d28d470f738a4be5d2889ac1a92..97f86a0fa2b8e83ea42e2b8cbdee05924ed6b842 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2566,6 +2566,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0820-Win-Screen-API.patch b/patches/server/0820-Win-Screen-API.patch index cc03508ae..57ec093bb 100644 --- a/patches/server/0820-Win-Screen-API.patch +++ b/patches/server/0820-Win-Screen-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API public net.minecraft.server.level.ServerPlayer seenCredits diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ddfe12d04328602cfcb8c7a524ab29337718d594..3a36479a6fce1ae4f76b212df4d3addb16778e64 100644 +index 97f86a0fa2b8e83ea42e2b8cbdee05924ed6b842..89d15164b085e5ff8821257c00746f2a787b4209 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1292,6 +1292,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0846-Expand-PlayerItemMendEvent.patch b/patches/server/0846-Expand-PlayerItemMendEvent.patch index fd08e6dd4..0b60cbe2f 100644 --- a/patches/server/0846-Expand-PlayerItemMendEvent.patch +++ b/patches/server/0846-Expand-PlayerItemMendEvent.patch @@ -33,7 +33,7 @@ index adc3e6298a1946fdea029c82a9954fb5b6e24497..a207a31d80a302dbdfe80f8727222542 return k > 0 ? this.repairPlayerItems(player, k) : 0; } else { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3a36479a6fce1ae4f76b212df4d3addb16778e64..efada5eb6f95a899faee1c9ed9474d991001e6d3 100644 +index 89d15164b085e5ff8821257c00746f2a787b4209..22d32abd43ee4f0e0a15d083d3f0393f1f2c99b8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1835,11 +1835,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0866-Fix-BanList-API.patch b/patches/server/0866-Fix-BanList-API.patch index 92ad7883e..0fad5866e 100644 --- a/patches/server/0866-Fix-BanList-API.patch +++ b/patches/server/0866-Fix-BanList-API.patch @@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index efada5eb6f95a899faee1c9ed9474d991001e6d3..d6891d91968b43f484baff1d0b1cb9b640e40118 100644 +index 22d32abd43ee4f0e0a15d083d3f0393f1f2c99b8..178c52a0752e433d028cd96c4e3451de6a590356 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1733,23 +1733,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0885-Bandaid-fix-for-Effect.patch b/patches/server/0885-Bandaid-fix-for-Effect.patch index dbe33cad9..e52b7d570 100644 --- a/patches/server/0885-Bandaid-fix-for-Effect.patch +++ b/patches/server/0885-Bandaid-fix-for-Effect.patch @@ -65,7 +65,7 @@ index 80aa2aebc490e763d2b9dfd56bcaff94cb13cd91..e99ebf806f955a7c0c163ef546b884c7 // Special case: the axis is optional for ELECTRIC_SPARK Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d6891d91968b43f484baff1d0b1cb9b640e40118..14c856df79b9089e2525cfc0afd9d1a86e1963d1 100644 +index 178c52a0752e433d028cd96c4e3451de6a590356..9e329d8d023ab601365a39a5ab8fb840f47fd623 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -914,7 +914,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0893-Add-Listing-API-for-Player.patch b/patches/server/0893-Add-Listing-API-for-Player.patch index 80b428569..2e5942b4d 100644 --- a/patches/server/0893-Add-Listing-API-for-Player.patch +++ b/patches/server/0893-Add-Listing-API-for-Player.patch @@ -119,7 +119,7 @@ index ea04eb049e16d1027d15f9863d1fcd16f090c464..0aa28caa1254137c0bae8e213bd08c9a // Paper end - Use single player info update packet on join player.sentListPacket = true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 14c856df79b9089e2525cfc0afd9d1a86e1963d1..0af445c316b4b6fb5a214e2533375894bef7c793 100644 +index 9e329d8d023ab601365a39a5ab8fb840f47fd623..7321575552591477c4f22f09ba15fcadfb4727e3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -198,6 +198,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0903-Implement-OfflinePlayer-isConnected.patch b/patches/server/0903-Implement-OfflinePlayer-isConnected.patch index 27e6e32fb..50f3fabf7 100644 --- a/patches/server/0903-Implement-OfflinePlayer-isConnected.patch +++ b/patches/server/0903-Implement-OfflinePlayer-isConnected.patch @@ -23,7 +23,7 @@ index 4d654c4f0b6210a9841427789ba70ce5d1d308be..9d93130f23addb18b97d7f5ec013faef public String getName() { Player player = this.getPlayer(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0af445c316b4b6fb5a214e2533375894bef7c793..f38edb1bd8e9b71fc984e1d258bfdb7df91798b8 100644 +index 7321575552591477c4f22f09ba15fcadfb4727e3..89b71e30798473b175a916b157db444fb895b5a9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -253,6 +253,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0923-Add-player-idle-duration-API.patch b/patches/server/0923-Add-player-idle-duration-API.patch index fb3ce7275..040eb5d83 100644 --- a/patches/server/0923-Add-player-idle-duration-API.patch +++ b/patches/server/0923-Add-player-idle-duration-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API Implements API for getting and resetting a player's idle duration. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f38edb1bd8e9b71fc984e1d258bfdb7df91798b8..17883cb58df02011dc846d5695b5162dec213ebf 100644 +index 89b71e30798473b175a916b157db444fb895b5a9..16e3c449afb01b423d37815828c4ba15288785f0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3399,6 +3399,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0926-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0926-Allow-null-itemstack-for-Player-sendEquipmentChange.patch index 8add9e8d4..68382e69e 100644 --- a/patches/server/0926-Allow-null-itemstack-for-Player-sendEquipmentChange.patch +++ b/patches/server/0926-Allow-null-itemstack-for-Player-sendEquipmentChange.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 17883cb58df02011dc846d5695b5162dec213ebf..72e404d4f588f597930c1340e26b37d354273652 100644 +index 16e3c449afb01b423d37815828c4ba15288785f0..d815e30be07db0c2eb690cc1985938d43956f75a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1125,7 +1125,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0940-Add-Structure-check-API.patch b/patches/server/0940-Add-Structure-check-API.patch index 327aca618..147147214 100644 --- a/patches/server/0940-Add-Structure-check-API.patch +++ b/patches/server/0940-Add-Structure-check-API.patch @@ -5,17 +5,25 @@ Subject: [PATCH] Add Structure check API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index c479fcf24025ba2c8a48dbc2b9b3c47d398be486..66efa8a5f70c63f07bfeb0088e6745ca4420cc0a 100644 +index c479fcf24025ba2c8a48dbc2b9b3c47d398be486..9483c268c19f469943ee0f344a8c599094c64f58 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -237,6 +237,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -237,6 +237,20 @@ public class CraftWorld extends CraftRegionAccessor implements World { }; } // Paper end + // Paper start - structure check API + @Override + public boolean hasStructureAt(final io.papermc.paper.math.Position position, final Structure structure) { -+ return this.world.structureManager().getStructureWithPieceAt(io.papermc.paper.util.MCUtil.toBlockPos(position), net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.STRUCTURE, CraftNamespacedKey.toMinecraft(structure.getKey()))).isValid(); ++ net.minecraft.world.level.levelgen.structure.Structure vanillaStructure = this.world.registryAccess() ++ .registryOrThrow(net.minecraft.core.registries.Registries.STRUCTURE) ++ .getHolder(CraftNamespacedKey.toMinecraft(structure.getStructureType().getKey())) ++ .orElseThrow() ++ .value(); ++ return this.world.structureManager().getStructureWithPieceAt( ++ io.papermc.paper.util.MCUtil.toBlockPos(position), ++ vanillaStructure ++ ).isValid(); + } + // Paper end diff --git a/patches/server/0947-Add-experience-points-API.patch b/patches/server/0947-Add-experience-points-API.patch index 68f529291..1a02324f3 100644 --- a/patches/server/0947-Add-experience-points-API.patch +++ b/patches/server/0947-Add-experience-points-API.patch @@ -18,7 +18,7 @@ index 230ffd3c4541ef8979605d733b6463e39cd00206..446556028028b25c35dbf3d099bf14a5 // Paper start - send while respecting visibility private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 72e404d4f588f597930c1340e26b37d354273652..318dacea25684e1b66b9484709aaeaf94328f13c 100644 +index d815e30be07db0c2eb690cc1985938d43956f75a..be57780bc7b1ecfdd6683d785fef8055fce0e222 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1902,6 +1902,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0968-More-Raid-API.patch b/patches/server/0968-More-Raid-API.patch index 5cf34618a..64b69fb2f 100644 --- a/patches/server/0968-More-Raid-API.patch +++ b/patches/server/0968-More-Raid-API.patch @@ -86,10 +86,10 @@ index b8ce1c1c2447f9cff1717bfcfd6eb911ade0d4b3..51f21af9d75769abdcba713b9aa33392 + // Paper end - more Raid API } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 66efa8a5f70c63f07bfeb0088e6745ca4420cc0a..cb48090de2f9912ed5abd03a543a33452fc83f8e 100644 +index 9483c268c19f469943ee0f344a8c599094c64f58..9dbdbdda2f55c33d98fc7cd00327b275d9fc5c9b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2365,6 +2365,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2373,6 +2373,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { return (raid == null) ? null : new CraftRaid(raid); } diff --git a/patches/server/0984-Starlight.patch b/patches/server/0984-Starlight.patch index 32a1a795f..0a239e7bc 100644 --- a/patches/server/0984-Starlight.patch +++ b/patches/server/0984-Starlight.patch @@ -5410,10 +5410,10 @@ index 88f0aca2da0e14ed5ec0513944fa0ba28b73b5d1..01d6b8683a9fa30d05b03ebfef8ee2dc return nbt != null ? ChunkStatus.byName(nbt.getString("Status")).getChunkType() : ChunkType.PROTOCHUNK; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index cb48090de2f9912ed5abd03a543a33452fc83f8e..25ccbeace5bfc10fe3c885ea8dd984b08b4668ae 100644 +index 9dbdbdda2f55c33d98fc7cd00327b275d9fc5c9b..a7aafc754b9c69f19d38504a7bbe551275cd0c42 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -499,12 +499,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -507,12 +507,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { } } diff --git a/patches/server/0985-Rewrite-chunk-system.patch b/patches/server/0985-Rewrite-chunk-system.patch index 0507a6011..72409d4dd 100644 --- a/patches/server/0985-Rewrite-chunk-system.patch +++ b/patches/server/0985-Rewrite-chunk-system.patch @@ -21547,10 +21547,10 @@ index 5467a5985eaf159e2a4f19dd5723d05d8f2d598e..66fa93a44a348f9cd300ec0c4a2d09a7 // Paper start - Adventure diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 25ccbeace5bfc10fe3c885ea8dd984b08b4668ae..4bcfae1ca9c2ba590d800534bb199f947c114c20 100644 +index a7aafc754b9c69f19d38504a7bbe551275cd0c42..0d8253f12f8da7f8859b87590bed08ba13df9295 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -510,10 +510,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -518,10 +518,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { ChunkHolder playerChunk = this.world.getChunkSource().chunkMap.getVisibleChunkIfPresent(ChunkPos.asLong(x, z)); if (playerChunk == null) return false; @@ -21568,7 +21568,7 @@ index 25ccbeace5bfc10fe3c885ea8dd984b08b4668ae..4bcfae1ca9c2ba590d800534bb199f94 ClientboundLevelChunkWithLightPacket refreshPacket = new ClientboundLevelChunkWithLightPacket(chunk, this.world.getLightEngine(), null, null); for (ServerPlayer player : playersInRange) { -@@ -521,8 +525,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -529,8 +533,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { player.connection.send(refreshPacket); } @@ -21578,7 +21578,7 @@ index 25ccbeace5bfc10fe3c885ea8dd984b08b4668ae..4bcfae1ca9c2ba590d800534bb199f94 return true; } -@@ -601,20 +604,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -609,20 +612,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public Collection getPluginChunkTickets(int x, int z) { DistanceManager chunkDistanceManager = this.world.getChunkSource().chunkMap.distanceManager; @@ -21600,7 +21600,7 @@ index 25ccbeace5bfc10fe3c885ea8dd984b08b4668ae..4bcfae1ca9c2ba590d800534bb199f94 } @Override -@@ -622,7 +612,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -630,7 +620,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { Map> ret = new HashMap<>(); DistanceManager chunkDistanceManager = this.world.getChunkSource().chunkMap.distanceManager; @@ -21609,7 +21609,7 @@ index 25ccbeace5bfc10fe3c885ea8dd984b08b4668ae..4bcfae1ca9c2ba590d800534bb199f94 long chunkKey = chunkTickets.getLongKey(); SortedArraySet> tickets = chunkTickets.getValue(); -@@ -1319,12 +1309,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1327,12 +1317,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public int getViewDistance() { @@ -21624,7 +21624,7 @@ index 25ccbeace5bfc10fe3c885ea8dd984b08b4668ae..4bcfae1ca9c2ba590d800534bb199f94 } public BlockMetadataStore getBlockMetadata() { -@@ -2487,17 +2477,20 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2495,17 +2485,20 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public void setSimulationDistance(final int simulationDistance) { @@ -21649,7 +21649,7 @@ index 25ccbeace5bfc10fe3c885ea8dd984b08b4668ae..4bcfae1ca9c2ba590d800534bb199f94 // Paper start - implement pointers diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 318dacea25684e1b66b9484709aaeaf94328f13c..2c72ae02ac9863fd023f784f2562418f7d247b4d 100644 +index be57780bc7b1ecfdd6683d785fef8055fce0e222..d6bae0731fc0e43fd3bdc775a4c5255d79891c7a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3462,31 +3462,31 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0992-Fix-World-isChunkGenerated-calls.patch b/patches/server/0992-Fix-World-isChunkGenerated-calls.patch index 75f55a10b..26ca3e945 100644 --- a/patches/server/0992-Fix-World-isChunkGenerated-calls.patch +++ b/patches/server/0992-Fix-World-isChunkGenerated-calls.patch @@ -152,10 +152,10 @@ index c2838ae91b7f078369b63503df57a1eb5d2b0df5..c33640859aab837c85f3e860fe2241a0 // Paper start - don't write garbage data to disk if writing serialization fails dataoutputstream.close(); // Only write if successful diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4bcfae1ca9c2ba590d800534bb199f947c114c20..67e51df85f967e7f3184a7b21562b26cbd64eae1 100644 +index 0d8253f12f8da7f8859b87590bed08ba13df9295..77d96f76440f34630c2faf2526503522e4451ffd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -383,9 +383,23 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -391,9 +391,23 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public boolean isChunkGenerated(int x, int z) { @@ -181,7 +181,7 @@ index 4bcfae1ca9c2ba590d800534bb199f947c114c20..67e51df85f967e7f3184a7b21562b26c throw new RuntimeException(ex); } } -@@ -539,20 +553,48 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -547,20 +561,48 @@ public class CraftWorld extends CraftRegionAccessor implements World { public boolean loadChunk(int x, int z, boolean generate) { org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot warnUnsafeChunk("loading a faraway chunk", x, z); // Paper diff --git a/patches/server/0996-Anti-Xray.patch b/patches/server/0996-Anti-Xray.patch index 207260d30..b7302c5a8 100644 --- a/patches/server/0996-Anti-Xray.patch +++ b/patches/server/0996-Anti-Xray.patch @@ -1586,10 +1586,10 @@ index 66fa93a44a348f9cd300ec0c4a2d09a7a2bf47e1..ac9873c430a3ece5c4b5f5305496639a // Paper start - Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 67e51df85f967e7f3184a7b21562b26cbd64eae1..505498bca3811f5cd080dd4797d5914c5fb433da 100644 +index 77d96f76440f34630c2faf2526503522e4451ffd..bb15f318019584f68ce3aeb989d560070665a77d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -533,11 +533,16 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -541,11 +541,16 @@ public class CraftWorld extends CraftRegionAccessor implements World { List playersInRange = playerChunk.playerProvider.getPlayers(playerChunk.getPos(), false); if (playersInRange.isEmpty()) return true; // Paper - rewrite player chunk loader diff --git a/patches/server/1035-API-for-checking-sent-chunks.patch b/patches/server/1035-API-for-checking-sent-chunks.patch index 72d15a69f..74178c040 100644 --- a/patches/server/1035-API-for-checking-sent-chunks.patch +++ b/patches/server/1035-API-for-checking-sent-chunks.patch @@ -21,7 +21,7 @@ index ee58c67cb2bd78159cce19ec75f13dc6168a0e7a..149cfb0587299f72fcfddf395fb71b70 // TODO rebase into util patch diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 2c72ae02ac9863fd023f784f2562418f7d247b4d..3462e0719cb430aced15ff61adb612391862b33f 100644 +index d6bae0731fc0e43fd3bdc775a4c5255d79891c7a..48cc32b1af151f73f97bf2a2def97edb3fbff609 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3454,6 +3454,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {