From a8134ca46810303da8558863165bf50d9e2bcea9 Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Tue, 1 Oct 2024 19:07:41 -0400 Subject: [PATCH] Fix craft with armor or offhand, thanks @ReconXMaverick #2293 --- .../java/me/pikamug/quests/util/BukkitInventoryUtil.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/me/pikamug/quests/util/BukkitInventoryUtil.java b/core/src/main/java/me/pikamug/quests/util/BukkitInventoryUtil.java index a8380c80d..fcfb5ebb6 100644 --- a/core/src/main/java/me/pikamug/quests/util/BukkitInventoryUtil.java +++ b/core/src/main/java/me/pikamug/quests/util/BukkitInventoryUtil.java @@ -10,6 +10,7 @@ package me.pikamug.quests.util; +import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.EntityEquipment; @@ -167,7 +168,13 @@ public class BukkitInventoryUtil { * @return number of empty slots */ public static int getEmptySlots(final Player player) { - final ItemStack[] contents = player.getInventory().getContents(); + final String bukkitVersion = Bukkit.getServer().getBukkitVersion().split("-")[0]; + final ItemStack[] contents; + if (bukkitVersion.startsWith("1.8.") || bukkitVersion.equals("1.8")) { + contents = player.getInventory().getContents(); + } else { + contents = player.getInventory().getStorageContents(); + } int i = 0; for (final ItemStack item : contents) if (item != null && item.getType() != Material.AIR) {