From 69683a66cc3d82192f2dcf1c4d83a34b3f8f9fe1 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Mon, 10 Jun 2024 14:06:27 +1000 Subject: [PATCH] SPIGOT-7731: Spawn eggs cannot have damage By: Doc --- .../java/org/bukkit/inventory/ItemFactory.java | 15 --------------- .../main/java/org/bukkit/inventory/ItemStack.java | 5 ----- 2 files changed, 20 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/inventory/ItemFactory.java b/paper-api/src/main/java/org/bukkit/inventory/ItemFactory.java index b8bb11544b..aa7fcae0de 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/paper-api/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -10,7 +10,6 @@ import org.bukkit.entity.EntityType; import org.bukkit.inventory.meta.BookMeta; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.SkullMeta; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -150,20 +149,6 @@ public interface ItemFactory { @NotNull ItemStack createItemStack(@NotNull String input) throws IllegalArgumentException; - /** - * Apply a material change for an item meta. Do not use under any - * circumstances. - * - * @param meta meta - * @param material material - * @return updated material - * @throws IllegalArgumentException if bad material or data - * @apiNote for internal use only - */ - @ApiStatus.Internal - @NotNull - Material updateMaterial(@NotNull final ItemMeta meta, @NotNull final Material material) throws IllegalArgumentException; - /** * Gets a {@link Material} representing the spawn egg for the provided * {@link EntityType}.
diff --git a/paper-api/src/main/java/org/bukkit/inventory/ItemStack.java b/paper-api/src/main/java/org/bukkit/inventory/ItemStack.java index 62f5e08e87..eade623288 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/paper-api/src/main/java/org/bukkit/inventory/ItemStack.java @@ -614,11 +614,6 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat } this.meta = Bukkit.getItemFactory().asMetaFor(itemMeta, material); - Material newType = Bukkit.getItemFactory().updateMaterial(meta, material); - if (this.type != newType) { - this.type = newType; - } - if (this.meta == itemMeta) { this.meta = itemMeta.clone(); }