Skip to content

Commit f33611c

Browse files
fix ItemStack#removeEnchantments creating non-stackable items (#11442)
1 parent dd6d184 commit f33611c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

patches/server/0960-General-ItemMeta-fixes.patch

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,16 @@ index f9eb60d5a70da9a4d485288ab03d80829cf171a9..440b4c13121e3ac2bab937a83d20cc3f
6868
protected void load(T tileEntity) {
6969
if (tileEntity != null && tileEntity != this.snapshot) {
7070
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
71-
index 6a449bfc765bf427d82df4a90bc60471b5de2fd3..aef5c0d1be9c4aa62d9b7c5cacbb42066a802729 100644
71+
index 6a449bfc765bf427d82df4a90bc60471b5de2fd3..efb7fb8dbaa7446e394f55b021692c11a25fd29f 100644
7272
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
7373
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
7474
@@ -279,7 +279,9 @@ public final class CraftItemStack extends ItemStack {
7575

7676
@Override
7777
public void removeEnchantments() {
78+
- this.handle.remove(DataComponents.ENCHANTMENTS);
7879
+ if (this.handle != null) { // Paper - fix NPE
79-
this.handle.remove(DataComponents.ENCHANTMENTS);
80+
+ this.handle.set(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY); // Paper - set to default instead of removing the component
8081
+ } // Paper
8182
}
8283

0 commit comments

Comments
 (0)