Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-08 08:31:51 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-7174: Avoid adding air to CraftMetaBundle

Browse Source 
By: Doc <nachito94@msn.com>
This commit is contained in:
CraftBukkit/Spigot 2022-10-28 19:57:22 +11:00
parent 5d713025af
commit 532c51f79d
1 changed files with 6 additions and 3 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/CraftMetaBundle.java
View File

@ -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);
}
}
}