From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
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 5f6b93be9e81df8fae9a5ab160a232b65ce7b8bc..c77634ec9c4e7a9eaacc81de7f95e9452b393a52 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -358,6 +358,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 7081aebf67cc3d8deb27dfc508970f0fa5e9d1b6..9ce03abd24ae8c2f156ade360094157e20f63666 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -592,6 +592,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 6aa64334943a22da8cfcac88d48ae8156ad7a9b4..630e16403cb1fc0f4ba798993bb0c3139196a97c 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 937ddd3a2b9e1df2c8835079923c339178f08459..ceca8b6a4a11753bef7ad341c34ccda60114c6b5 100644
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
@@ -236,6 +236,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(ENTITY_TAG_METAS.contains(stack.getItemMeta().getClass()), "missing entity tag meta handling for " + item);
+                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(ENTITY_TAG_METAS.contains(stack.getItemMeta().getClass()), "missing entity tag meta handling for " + item);
+            }
+        }
+    }
+    // Paper end
+
     @Test
     public void testEachExtraData() {
         final List<StackProvider> providers = Arrays.asList(