File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -68,15 +68,16 @@ index f9eb60d5a70da9a4d485288ab03d80829cf171a9..440b4c13121e3ac2bab937a83d20cc3f
68
68
protected void load(T tileEntity) {
69
69
if (tileEntity != null && tileEntity != this.snapshot) {
70
70
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
72
72
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
73
73
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
74
74
@@ -279,7 +279,9 @@ public final class CraftItemStack extends ItemStack {
75
75
76
76
@Override
77
77
public void removeEnchantments() {
78
+ - this.handle.remove(DataComponents.ENCHANTMENTS);
78
79
+ 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
80
81
+ } // Paper
81
82
}
82
83
You can’t perform that action at this time.
0 commit comments