From bffb08c2f99a5527b7357d005cb10ba21cf048d9 Mon Sep 17 00:00:00 2001 From: Tamion <70228790+notTamion@users.noreply.github.com> Date: Sat, 4 Nov 2023 21:20:13 +0100 Subject: Deprecate Player#boostElytra (#9899) The Paper method was chosen for deprecation because it was more restrictive in that it has an isGliding check. --- .../0965-fix-item-meta-for-tadpole-buckets.patch | 74 ++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 patches/server/0965-fix-item-meta-for-tadpole-buckets.patch (limited to 'patches/server/0965-fix-item-meta-for-tadpole-buckets.patch') diff --git a/patches/server/0965-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0965-fix-item-meta-for-tadpole-buckets.patch new file mode 100644 index 0000000000..c1d43316d3 --- /dev/null +++ b/patches/server/0965-fix-item-meta-for-tadpole-buckets.patch @@ -0,0 +1,74 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +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 6e91c7ccc36e088be60739dd71b287f0b922a055..57f4cf40359fe9bb427eb0134660d00839a63c86 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +@@ -348,6 +348,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 b758cf51923f9e227c287680287dc18525bed4a0..ff9e42299d46764cd53f72c730716102c6b8aa3c 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +@@ -600,6 +600,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> 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 providers = Arrays.asList( -- cgit v1.2.3