testserver/Spigot-Server-Patches/0167-Process-NMS-Data-Conve...

67 lines
2.7 KiB
Diff
Raw Normal View History

2016-12-03 00:07:07 +00:00
From a4bbaeed9543205cae74962e91ad5472309a2054 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 22:31:18 -0400
Subject: [PATCH] Process NMS Data Conversion post ItemMeta on Copy
ItemMeta apply is a destructive process that expects to be the authority on
what the items NBT data is.
When CraftItemStack.asNMSCopy was called, the conversion ran, potentially setting
the converted data into the ItemStacks tag.
Then if that item had ItemMeta, it would completely undo that conversion by
erasing the NBT Tag.
On copy, run conversion post ItemMeta apply.
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
2016-12-03 00:07:07 +00:00
index 6697305..1218c00 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
2016-11-17 02:23:38 +00:00
@@ -55,13 +55,24 @@ public final class ItemStack {
this(item, i, 0);
}
+ // Paper start
public ItemStack(Item item, int i, int j) {
+ this(item, i, j, true);
+ }
+ public ItemStack(Item item, int i, int j, boolean convert) {
+ // Paper end
this.item = item;
2016-11-17 02:23:38 +00:00
this.damage = j;
this.count = i;
2016-11-17 02:23:38 +00:00
// CraftBukkit start - Pass to setData to do filtering
+ // Paper start
2016-11-17 02:23:38 +00:00
+ if (convert) convertData(j);
+ }
2016-11-17 02:23:38 +00:00
+
+ public final void convertData(int data) {
+ // Paper end
if (MinecraftServer.getServer() != null) {
2016-11-17 02:23:38 +00:00
- this.setData(j);
+ this.setData(data);
NBTTagCompound savedStack = new NBTTagCompound();
this.save(savedStack);
2016-11-17 02:23:38 +00:00
MinecraftServer.getServer().getDataConverterManager().a(DataConverterTypes.ITEM_INSTANCE, savedStack); // PAIL: convert
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
2016-12-03 00:07:07 +00:00
index 4afd3a9..a862e94 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
2016-11-17 02:23:38 +00:00
@@ -41,10 +41,11 @@ public final class CraftItemStack extends ItemStack {
return net.minecraft.server.ItemStack.a;
}
- net.minecraft.server.ItemStack stack = new net.minecraft.server.ItemStack(item, original.getAmount(), original.getDurability());
+ net.minecraft.server.ItemStack stack = new net.minecraft.server.ItemStack(item, original.getAmount(), original.getDurability(), false); // Paper
if (original.hasItemMeta()) {
setItemMeta(stack, original.getItemMeta());
}
2016-11-17 02:23:38 +00:00
+ stack.convertData(original.getDurability()); // Paper
return stack;
}
--
2016-12-03 00:07:07 +00:00
2.10.2