summaryrefslogtreecommitdiffhomepage
path: root/patches/server/0834-fix-item-meta-for-tadpole-buckets.patch
diff options
context:
space:
mode:
authorLulu13022002 <[email protected]>2024-09-21 21:19:02 +0200
committerGitHub <[email protected]>2024-09-21 21:19:02 +0200
commit1ed64f82704c299d0f7ae9af710579be995af8de (patch)
tree8de9a329fed8373ae5eccc59a9ee9558a53ee3fd /patches/server/0834-fix-item-meta-for-tadpole-buckets.patch
parent593faf4fc3ad433ef523672b6553124dd99f8ca3 (diff)
downloadPaper-1ed64f82704c299d0f7ae9af710579be995af8de.tar.gz
Paper-1ed64f82704c299d0f7ae9af710579be995af8de.zip
Update launchProjectile API (#11300)
Diffstat (limited to 'patches/server/0834-fix-item-meta-for-tadpole-buckets.patch')
-rw-r--r--patches/server/0834-fix-item-meta-for-tadpole-buckets.patch63
1 files changed, 63 insertions, 0 deletions
diff --git a/patches/server/0834-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0834-fix-item-meta-for-tadpole-buckets.patch
new file mode 100644
index 0000000000..b367979963
--- /dev/null
+++ b/patches/server/0834-fix-item-meta-for-tadpole-buckets.patch
@@ -0,0 +1,63 @@
+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/CraftItemMetas.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemMetas.java
+index c9fbc01be0b0e7fd1cafb091d06496f4ba1e7c2c..a4c4ba0d02f9a072236ce86c1e98e2c60b059cb8 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemMetas.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemMetas.java
+@@ -263,7 +263,7 @@ public final class CraftItemMetas {
+ if (itemType == ItemType.SUSPICIOUS_STEW) {
+ return CraftItemMetas.asType(CraftItemMetas.SUSPICIOUS_STEW_META_DATA);
+ }
+- if (itemType == ItemType.COD_BUCKET || itemType == ItemType.PUFFERFISH_BUCKET
++ if (itemType == ItemType.COD_BUCKET || itemType == ItemType.PUFFERFISH_BUCKET || itemType == ItemType.TADPOLE_BUCKET // Paper
+ || itemType == ItemType.SALMON_BUCKET || itemType == ItemType.ITEM_FRAME
+ || itemType == ItemType.GLOW_ITEM_FRAME || itemType == ItemType.PAINTING) {
+ return CraftItemMetas.asType(CraftItemMetas.ENTITY_TAG_META_DATA);
+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 c0b7bb970bfd1ccd3bc071a77c47b374094a2fb6..3a9e5c6d781e9c24e040ebf95325f005ec9e8a3c 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(