From 982364797ff6a05785183a32323e844d34318065 Mon Sep 17 00:00:00 2001 From: Doc Date: Fri, 28 Oct 2022 19:57:22 +1100 Subject: [PATCH] SPIGOT-7174: Avoid adding air to CraftMetaBundle --- .../bukkit/craftbukkit/inventory/CraftMetaBundle.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBundle.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBundle.java index 9ae8e4a7c..10f520585 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBundle.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBundle.java @@ -47,7 +47,10 @@ public class CraftMetaBundle extends CraftMetaItem implements BundleMeta { for (int i = 0; i < list.size(); i++) { NBTTagCompound nbttagcompound1 = list.getCompound(i); - addItem(CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.of(nbttagcompound1))); + ItemStack itemStack = CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.of(nbttagcompound1)); + if (!itemStack.getType().isAir()) { // SPIGOT-7174 - Avoid adding air + addItem(itemStack); + } } } } @@ -59,8 +62,8 @@ public class CraftMetaBundle extends CraftMetaItem implements BundleMeta { Iterable items = SerializableMeta.getObject(Iterable.class, map, ITEMS.BUKKIT, true); if (items != null) { for (Object stack : items) { - if (stack instanceof ItemStack) { - addItem((ItemStack) stack); + if (stack instanceof ItemStack itemStack && !itemStack.getType().isAir()) { // SPIGOT-7174 - Avoid adding air + addItem(itemStack); } } }