aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/1024-Proxy-ItemStack-to-CraftItemStack.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/1024-Proxy-ItemStack-to-CraftItemStack.patch')
-rw-r--r--patches/server/1024-Proxy-ItemStack-to-CraftItemStack.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/server/1024-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/1024-Proxy-ItemStack-to-CraftItemStack.patch
index eb49cbe5f4..a45cc672d3 100644
--- a/patches/server/1024-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/server/1024-Proxy-ItemStack-to-CraftItemStack.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Proxy ItemStack to CraftItemStack
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 369d43f911289b670dcef3b7af3dce73273d95ab..22b0febba8fbfc9b2ab1a623932ffff32ca8040c 100644
+index 033918e051ef44de82a74097380cacaf926e5408..08a1e8087b4f948ae31a3c3ef453261dc3dbc287 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -25,15 +25,57 @@ import org.bukkit.material.MaterialData;
+@@ -26,15 +26,57 @@ import org.jetbrains.annotations.ApiStatus;
@DelegateDeserialization(ItemStack.class)
public final class CraftItemStack extends ItemStack {
@@ -71,7 +71,7 @@ index 369d43f911289b670dcef3b7af3dce73273d95ab..22b0febba8fbfc9b2ab1a623932ffff3
public static net.minecraft.world.item.ItemStack getOrCloneOnMutation(ItemStack old, ItemStack newInstance) {
return old == newInstance ? unwrap(old) : asNMSCopy(newInstance);
}
-@@ -47,25 +89,13 @@ public final class CraftItemStack extends ItemStack {
+@@ -48,25 +90,13 @@ public final class CraftItemStack extends ItemStack {
// Paper end - override isEmpty to use vanilla's impl
public static net.minecraft.world.item.ItemStack asNMSCopy(ItemStack original) {
@@ -102,7 +102,7 @@ index 369d43f911289b670dcef3b7af3dce73273d95ab..22b0febba8fbfc9b2ab1a623932ffff3
}
// Paper start
-@@ -88,14 +118,10 @@ public final class CraftItemStack extends ItemStack {
+@@ -89,14 +119,10 @@ public final class CraftItemStack extends ItemStack {
* Copies the NMS stack to return as a strictly-Bukkit stack
*/
public static ItemStack asBukkitCopy(net.minecraft.world.item.ItemStack original) {
@@ -121,7 +121,7 @@ index 369d43f911289b670dcef3b7af3dce73273d95ab..22b0febba8fbfc9b2ab1a623932ffff3
}
public static CraftItemStack asCraftMirror(net.minecraft.world.item.ItemStack original) {
-@@ -313,11 +339,7 @@ public final class CraftItemStack extends ItemStack {
+@@ -315,11 +341,7 @@ public final class CraftItemStack extends ItemStack {
@Override
public CraftItemStack clone() {
@@ -134,7 +134,7 @@ index 369d43f911289b670dcef3b7af3dce73273d95ab..22b0febba8fbfc9b2ab1a623932ffff3
}
@Override
-@@ -420,22 +442,14 @@ public final class CraftItemStack extends ItemStack {
+@@ -422,22 +444,14 @@ public final class CraftItemStack extends ItemStack {
if (stack == this) {
return true;
}