29 lines
1.5 KiB
Diff
29 lines
1.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Tue, 22 Nov 2016 00:40:42 -0500
|
||
|
|
Subject: [PATCH] Remove unnecessary itemmeta handling
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
|
||
|
|
index 70631b3fe080320dfea0d1a4deb23e87448da250..35377576ed182814051c11f902e02e8e921e84e3 100644
|
||
|
|
--- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
|
||
|
|
+++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
|
||
|
|
@@ -579,7 +579,7 @@ public class FriendlyByteBuf extends ByteBuf {
|
||
|
|
if (item.canBeDepleted() || item.shouldOverrideMultiplayerNbt()) {
|
||
|
|
// Spigot start - filter
|
||
|
|
stack = stack.copy();
|
||
|
|
- CraftItemStack.setItemMeta(stack, CraftItemStack.getItemMeta(stack));
|
||
|
|
+ // CraftItemStack.setItemMeta(stack, CraftItemStack.getItemMeta(stack)); // Paper - This is no longer with raw NBT being handled in metadata
|
||
|
|
// Spigot end
|
||
|
|
nbttagcompound = stack.getTag();
|
||
|
|
}
|
||
|
|
@@ -600,7 +600,7 @@ public class FriendlyByteBuf extends ByteBuf {
|
||
|
|
|
||
|
|
itemstack.setTag(this.readNbt());
|
||
|
|
// CraftBukkit start
|
||
|
|
- if (itemstack.getTag() != null) {
|
||
|
|
+ if (false && itemstack.getTag() != null) { // Paper - This is no longer needed with raw NBT being handled in metadata
|
||
|
|
CraftItemStack.setItemMeta(itemstack, CraftItemStack.getItemMeta(itemstack));
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|