2024-04-24 04:46:06 +02:00
|
|
|
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/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
2024-04-25 23:21:18 +02:00
|
|
|
index 7ca60db3a639e68456933f8e5af900dc4aade575..836a9bb57fa6e916ed8a24c35426c6432f73be88 100644
|
2024-04-24 04:46:06 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
2024-04-25 05:14:51 +02:00
|
|
|
@@ -177,7 +177,7 @@ public final class ItemStack implements DataComponentHolder {
|
2024-04-24 04:46:06 +02:00
|
|
|
|
|
|
|
// CraftBukkit start
|
|
|
|
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));
|
|
|
|
}
|
|
|
|
return itemstack;
|
2024-04-25 05:14:51 +02:00
|
|
|
@@ -192,7 +192,7 @@ public final class ItemStack implements DataComponentHolder {
|
2024-04-24 04:46:06 +02:00
|
|
|
registryfriendlybytebuf.writeVarInt(itemstack.getCount());
|
|
|
|
// Spigot start - filter
|
|
|
|
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
|
|
|
|
ITEM_STREAM_CODEC.encode(registryfriendlybytebuf, itemstack.getItemHolder()); // CraftBukkit - decompile error
|
|
|
|
DataComponentPatch.STREAM_CODEC.encode(registryfriendlybytebuf, itemstack.components.asPatch());
|