SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary itemmeta handling

Browse Source
This commit is contained in:
Aikar
2016-11-22 00:40:42 -05:00
parent 394e4c04f7
commit 223c6c3b5a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
paper-server/patches/sources/net/minecraft/world/item/ItemStack.java.patch
View File

@@ -100,7 +100,7 @@
- return new ItemStack(holder, i, datacomponentpatch); - return new ItemStack(holder, i, datacomponentpatch);
+ // CraftBukkit start + // CraftBukkit start
+ ItemStack itemstack = new ItemStack(holder, i, datacomponentpatch); + ItemStack itemstack = new ItemStack(holder, i, datacomponentpatch);
+ if (!datacomponentpatch.isEmpty()) { + if (false && !datacomponentpatch.isEmpty()) { // Paper - This is no longer needed with raw NBT being handled in metadata
+ CraftItemStack.setItemMeta(itemstack, CraftItemStack.getItemMeta(itemstack)); + CraftItemStack.setItemMeta(itemstack, CraftItemStack.getItemMeta(itemstack));
+ } + }
+ return itemstack; + return itemstack;
@@ -116,8 +116,8 @@
registryfriendlybytebuf.writeVarInt(itemstack.getCount()); registryfriendlybytebuf.writeVarInt(itemstack.getCount());
- null.ITEM_STREAM_CODEC.encode(registryfriendlybytebuf, itemstack.getItemHolder()); - null.ITEM_STREAM_CODEC.encode(registryfriendlybytebuf, itemstack.getItemHolder());
+ // Spigot start - filter + // Spigot start - filter
+ itemstack = itemstack.copy(); + // itemstack = itemstack.copy();
+ CraftItemStack.setItemMeta(itemstack, CraftItemStack.getItemMeta(itemstack)); + // CraftItemStack.setItemMeta(itemstack, CraftItemStack.getItemMeta(itemstack)); // Paper - This is no longer with raw NBT being handled in metadata
+ // Spigot end + // Spigot end
+ ITEM_STREAM_CODEC.encode(registryfriendlybytebuf, itemstack.getItemHolder()); // CraftBukkit - decompile error + ITEM_STREAM_CODEC.encode(registryfriendlybytebuf, itemstack.getItemHolder()); // CraftBukkit - decompile error
+ // Paper start - adventure; conditionally render translatable components + // Paper start - adventure; conditionally render translatable components