aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0910-Allow-proper-checking-of-empty-item-stacks.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0910-Allow-proper-checking-of-empty-item-stacks.patch')
-rw-r--r--patches/server/0910-Allow-proper-checking-of-empty-item-stacks.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/server/0910-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0910-Allow-proper-checking-of-empty-item-stacks.patch
new file mode 100644
index 0000000000..906d0184e4
--- /dev/null
+++ b/patches/server/0910-Allow-proper-checking-of-empty-item-stacks.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aeltumn <[email protected]>
+Date: Mon, 28 Aug 2023 13:44:09 +0200
+Subject: [PATCH] Allow proper checking of empty item stacks
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+index eb305f23898ecb0c1dbc4c659da0a23207d8d362..0790f10122546bff1079b522b08d117426364a95 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+@@ -36,12 +36,19 @@ public final class CraftItemStack extends ItemStack {
+ }
+ // Paper end - MC Utils
+
++ // Paper start - override isEmpty to use vanilla's impl
++ @Override
++ public boolean isEmpty() {
++ return handle == null || handle.isEmpty();
++ }
++ // Paper end - override isEmpty to use vanilla's impl
++
+ public static net.minecraft.world.item.ItemStack asNMSCopy(ItemStack original) {
+ if (original instanceof CraftItemStack) {
+ CraftItemStack stack = (CraftItemStack) original;
+ return stack.handle == null ? net.minecraft.world.item.ItemStack.EMPTY : stack.handle.copy();
+ }
+- if (original == null || original.getType() == Material.AIR) {
++ if (original == null || original.isEmpty()) { // Paper - override isEmpty to use vanilla's impl; use isEmpty
+ return net.minecraft.world.item.ItemStack.EMPTY;
+ }
+