Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 20:07:41 +01:00
Code Issues Projects Releases Wiki Activity

Allow proper checking of empty item stacks

Browse Source
This commit is contained in:
Aeltumn 2023-08-28 13:44:09 +02:00
parent d4ab21c047
commit 675028a699
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
View File

@ -45,12 +45,19 @@ public final class CraftItemStack extends ItemStack {
} }
// Paper end - MC Utils // 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) { public static net.minecraft.world.item.ItemStack asNMSCopy(ItemStack original) {
if (original instanceof CraftItemStack) { if (original instanceof CraftItemStack) {
CraftItemStack stack = (CraftItemStack) original; CraftItemStack stack = (CraftItemStack) original;
return stack.handle == null ? net.minecraft.world.item.ItemStack.EMPTY : stack.handle.copy(); 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; return net.minecraft.world.item.ItemStack.EMPTY;
} }