fix item meta for tadpole buckets (#9473)

1 files changed, 74 insertions, 0 deletions

diff --git a/patches/server/0984-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0984-fix-item-meta-for-tadpole-buckets.patch
new file mode 100644
index 0000000000..666154a130
--- /dev/null
+++ b/patches/server/0984-fix-item-meta-for-tadpole-buckets.patch
@@ -0,0 +1,74 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Tue, 11 Jul 2023 11:22:30 -0700
+Subject: [PATCH] fix item meta for tadpole buckets
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+index 849e93a8a0645de4c3e6ab8047815d78a722d4f6..b4850f4da500771e890247d9ed7f7d027460a718 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+@@ -344,6 +344,7 @@ public final class CraftItemFactory implements ItemFactory {
+         case COD_BUCKET:
+         case PUFFERFISH_BUCKET:
+         case SALMON_BUCKET:
++        case TADPOLE_BUCKET: // Paper
+         case ITEM_FRAME:
+         case GLOW_ITEM_FRAME:
+         case PAINTING:
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+index 8657736cdfe2d5d2a1c0851ca54dd26ce17e0a83..f62ef038af2dfe7525e72c8b8e30a3fa9ce2b451 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+@@ -579,6 +579,7 @@ public final class CraftItemStack extends ItemStack {
+             case COD_BUCKET:
+             case PUFFERFISH_BUCKET:
+             case SALMON_BUCKET:
++            case TADPOLE_BUCKET: // Paper
+             case ITEM_FRAME:
+             case GLOW_ITEM_FRAME:
+             case PAINTING:
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
+index e65bdbbbedb91eca016d46de5cc7cbb70dd9f659..9024467a627a40a145a951510f2207e2a175a4ab 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
+@@ -16,6 +16,7 @@ public class CraftMetaEntityTag extends CraftMetaItem {
+             Material.COD_BUCKET,
+             Material.PUFFERFISH_BUCKET,
+             Material.SALMON_BUCKET,
++            Material.TADPOLE_BUCKET, // Paper
+             Material.ITEM_FRAME,
+             Material.GLOW_ITEM_FRAME,
+             Material.PAINTING
+diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
+index 7cc7f485325a4277bac7a6eade749dbb3b0b104f..6930e7fdbe1f42020afb9c089c77da60408dacd7 100644
+--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
++++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
+@@ -235,6 +235,27 @@ public class ItemMetaTest extends AbstractTestingBase {
+         }
+     }
+ 
++    // Paper start - check entity tag metas
++    private static final java.util.Set<Class<?>> ENTITY_TAG_METAS = java.util.Set.of(
++        CraftMetaEntityTag.class,
++        CraftMetaTropicalFishBucket.class,
++        CraftMetaAxolotlBucket.class
++    );
++    @Test
++    public void testEntityTagMeta() {
++        for (final Item item : BuiltInRegistries.ITEM) {
++            if (item instanceof net.minecraft.world.item.HangingEntityItem || item instanceof net.minecraft.world.item.MobBucketItem) {
++                ItemStack stack = new ItemStack(CraftMagicNumbers.getMaterial(item));
++                assertTrue("missing entity tag meta handling for " + item, ENTITY_TAG_METAS.contains(stack.getItemMeta().getClass()));
++                stack = CraftItemStack.asNewCraftStack(net.minecraft.world.item.Items.STONE);
++                stack.editMeta(meta -> meta.displayName(net.kyori.adventure.text.Component.text("hello")));
++                stack.setType(CraftMagicNumbers.getMaterial(item));
++                assertTrue("missing entity tag meta handling for " + item, ENTITY_TAG_METAS.contains(stack.getItemMeta().getClass()));
++            }
++        }
++    }
++    // Paper end
++
+     @Test
+     public void testEachExtraData() {
+         final List<StackProvider> providers = Arrays.asList(