From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aeltumn 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 b05a5c8a4a4136d30e1c93015f79d753fe1a2ace..7722565c5e577c2097c43eb7aaed25c4dce6b7b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -33,12 +33,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 + 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 - use isEmpty return net.minecraft.world.item.ItemStack.EMPTY; }