aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0856-fix-item-meta-for-tadpole-buckets.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0856-fix-item-meta-for-tadpole-buckets.patch')
-rw-r--r--patches/server/0856-fix-item-meta-for-tadpole-buckets.patch74
1 files changed, 74 insertions, 0 deletions
diff --git a/patches/server/0856-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0856-fix-item-meta-for-tadpole-buckets.patch
new file mode 100644
index 0000000000..61e0e014da
--- /dev/null
+++ b/patches/server/0856-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 c13944058e26895a03f0013b6ca49ac7580ee9bf..6e2a6ce5cf456bd9f6c8c18a58f08e2285dc77ed 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+@@ -364,6 +364,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 a1173823b3a95b973ae742f886b0555b3203288c..55ae50f99a891a26dcdc0ec6266e3c05b3d12a5e 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+@@ -604,6 +604,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 27af7ca9d62bdb4a24be5af139c181d7bc271ba5..3ff0340c40e9dc9a6e690de15ccade7a0c4e8f02 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
+@@ -19,6 +19,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 a1d8da4e0de3f84194f28d7d18fa795d53714590..d6018439015583fa0344c7c01b2e60a13de29795 100644
+--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
++++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
+@@ -208,6 +208,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(CraftItemType.minecraftToBukkit(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(CraftItemType.minecraftToBukkit(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(