mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix a couple of ItemMeta related NPEs (#11149)

Browse source
This commit is contained in:
Lulu13022002 2024-07-23 10:11:00 +02:00 • committed by GitHub
parent 5512af798f
commit 5a5035be96
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patches/server/1024-Proxy-ItemStack-to-CraftItemStack.patch
View file

@ -5,7 +5,7 @@ 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 033918e051ef44de82a74097380cacaf926e5408..08a1e8087b4f948ae31a3c3ef453261dc3dbc287 100644
index 69b7eb7eff112b59b22f1d349831b9ee14c01943..f4c7b0e2db55ad9cdf09da80f6756f941315fb30 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -26,15 +26,57 @@ import org.jetbrains.annotations.ApiStatus;
@ -121,7 +121,7 @@ index 033918e051ef44de82a74097380cacaf926e5408..08a1e8087b4f948ae31a3c3ef453261d
}
public static CraftItemStack asCraftMirror(net.minecraft.world.item.ItemStack original) {
@@ -315,11 +341,7 @@ public final class CraftItemStack extends ItemStack {
@@ -317,11 +343,7 @@ public final class CraftItemStack extends ItemStack {
@Override
public CraftItemStack clone() {
@ -134,7 +134,7 @@ index 033918e051ef44de82a74097380cacaf926e5408..08a1e8087b4f948ae31a3c3ef453261d
}
@Override
@@ -422,22 +444,14 @@ public final class CraftItemStack extends ItemStack {
@@ -424,22 +446,14 @@ public final class CraftItemStack extends ItemStack {
if (stack == this) {
return true;
}