mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
c97ce029e9
PaperMC believes that 1.16.2 is now ready for general release as we fixed the main issue plagueing the 1.16.x release, the MapLike data conversion issues. Until now, it was not safe for a server to convert a world to 1.16.2 without data conversion issues around villages and potentially other things. If you did, those MapLike errors meant something went wrong. This is now resolved. Big thanks to all those that helped, notably @BillyGalbreath and @Proximyst who did large parts of the update process with me. Please as always, backup your worlds and test before updating to 1.16.2! If you update to 1.16.2, there is no going back to an older build than this. --------------------------------- Co-authored-by: William Blake Galbreath <Blake.Galbreath@GMail.com> Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com> Co-authored-by: krolik-exe <69214078+krolik-exe@users.noreply.github.com> Co-authored-by: BillyGalbreath <BillyGalbreath@users.noreply.github.com> Co-authored-by: stonar96 <minecraft.stonar96@gmail.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Jason <jasonpenilla2@me.com> Co-authored-by: kashike <kashike@vq.lc> Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com> Co-authored-by: KennyTV <kennytv@t-online.de> Co-authored-by: commandblockguy <commandblockguy1@gmail.com> Co-authored-by: DigitalRegent <misterwener@gmail.com> Co-authored-by: ishland <ishlandmc@yeah.net>
78 lines
3.9 KiB
Diff
78 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Hugo Manrique <hugmanrique@gmail.com>
|
|
Date: Thu, 26 Jul 2018 14:10:23 +0200
|
|
Subject: [PATCH] Don't call getItemMeta on hasItemMeta
|
|
|
|
Spigot 1.13 checks if any field (which are manually copied from the ItemStack's "tag" NBT tag) on the ItemMeta class of an ItemStack is set.
|
|
|
|
We could just check if the "tag" NBT tag is empty, albeit that would break some plugins. The only general tag added on 1.13 is "Damage", and we can just check if the "tag" NBT tag contains any other tag that's not "Damage" (https://minecraft.gamepedia.com/Player.dat_format#Item_structure) making the `hasItemStack` method behave as before.
|
|
|
|
Returns true if getDamage() == 0 or has damage tag or other tag is set.
|
|
Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
|
index d315a102a5ae2a79189b39c3b534b8fd733cc9e4..addb8ef990de3dfbf74969ef4c22276d2fa2614a 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
|
@@ -570,7 +570,7 @@ public final class CraftItemStack extends ItemStack {
|
|
|
|
@Override
|
|
public boolean hasItemMeta() {
|
|
- return hasItemMeta(handle) && !CraftItemFactory.instance().equals(getItemMeta(), null);
|
|
+ return hasItemMeta(handle) && (handle.getDamage() != 0 || (handle.getTag() != null && handle.getTag().map.size() >= (handle.getTag().hasKey(CraftMetaItem.DAMAGE.NBT) ? 2 : 1))); // Paper - keep 1.12 CraftBukkit behavior without calling getItemMeta
|
|
}
|
|
|
|
static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
|
|
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
|
index ddbcbd565d5dcb5b1c8d46558e06887e85d589c5..b0edd62eb9066d145cfc52272c71d5f00b7e928d 100644
|
|
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
|
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
|
@@ -2,10 +2,9 @@ package org.bukkit.craftbukkit.inventory;
|
|
|
|
import static org.hamcrest.Matchers.*;
|
|
import static org.junit.Assert.*;
|
|
-import java.util.ArrayList;
|
|
-import java.util.Arrays;
|
|
-import java.util.List;
|
|
-import java.util.UUID;
|
|
+
|
|
+import java.util.*;
|
|
+
|
|
import com.destroystokyo.paper.inventory.meta.ArmorStandMeta; // Paper
|
|
import net.minecraft.server.Block;
|
|
import net.minecraft.server.IRegistry;
|
|
@@ -97,6 +96,34 @@ public class ItemMetaTest extends AbstractTestingBase {
|
|
assertThat(itemMeta.hasConflictingEnchant(null), is(false));
|
|
}
|
|
|
|
+ // Paper start
|
|
+ private void testItemMeta(ItemStack stack) {
|
|
+ assertThat("Should not have ItemMeta", stack.hasItemMeta(), is(false));
|
|
+
|
|
+ stack.setDurability((short) 0);
|
|
+ assertThat("ItemStack with zero durability should not have ItemMeta", stack.hasItemMeta(), is(false));
|
|
+
|
|
+ stack.setDurability((short) 2);
|
|
+ assertThat("ItemStack with non-zero durability should have ItemMeta", stack.hasItemMeta(), is(true));
|
|
+
|
|
+ stack.setLore(Collections.singletonList("Lore"));
|
|
+ assertThat("ItemStack with lore and durability should have ItemMeta", stack.hasItemMeta(), is(true));
|
|
+
|
|
+ stack.setDurability((short) 0);
|
|
+ assertThat("ItemStack with lore should have ItemMeta", stack.hasItemMeta(), is(true));
|
|
+
|
|
+ stack.setLore(null);
|
|
+ }
|
|
+
|
|
+ @Test
|
|
+ public void testHasItemMeta() {
|
|
+ ItemStack itemStack = new ItemStack(Material.SHEARS);
|
|
+
|
|
+ testItemMeta(itemStack);
|
|
+ testItemMeta(CraftItemStack.asCraftCopy(itemStack));
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Test
|
|
public void testConflictingStoredEnchantment() {
|
|
EnchantmentStorageMeta itemMeta = (EnchantmentStorageMeta) Bukkit.getItemFactory().getItemMeta(Material.ENCHANTED_BOOK);
|