From fdc01d66a4687d3ec7a3772633df035543b4f408 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 8 Oct 2021 21:58:30 +0100 Subject: [PATCH] Added weird edge case where ender chest was null --- .../willfp/talismans/talismans/util/TalismanChecks.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java index 785d31d..7ba54bf 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java @@ -11,6 +11,7 @@ import org.bukkit.NamespacedKey; import org.bukkit.block.BlockState; import org.bukkit.block.ShulkerBox; import org.bukkit.entity.Player; +import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BlockStateMeta; import org.bukkit.inventory.meta.ItemMeta; @@ -172,7 +173,12 @@ public class TalismanChecks { List rawContents = new ArrayList<>(Arrays.asList(player.getInventory().getContents())); if (readEnderChest) { - rawContents.addAll(Arrays.asList(player.getEnderChest().getContents())); + Inventory enderChest = player.getEnderChest(); + + // Not always true, bug reported where it was null. + if (enderChest != null) { + rawContents.addAll(Arrays.asList(enderChest.getContents())); + } } if (offhandOnly) {