From 3658946da0b799f23965ad23c3fedbc2642c1578 Mon Sep 17 00:00:00 2001 From: ceze88 Date: Fri, 28 Jul 2023 11:53:48 +0200 Subject: [PATCH] Fix NPE for some enchants --- .../com/craftaro/epicenchants/utils/single/GeneralUtils.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/craftaro/epicenchants/utils/single/GeneralUtils.java b/src/main/java/com/craftaro/epicenchants/utils/single/GeneralUtils.java index 5027e1a..f7f667e 100644 --- a/src/main/java/com/craftaro/epicenchants/utils/single/GeneralUtils.java +++ b/src/main/java/com/craftaro/epicenchants/utils/single/GeneralUtils.java @@ -11,6 +11,7 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.Event; +import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import java.util.Arrays; @@ -82,6 +83,9 @@ public class GeneralUtils { } public static int getHeldItemSlot(Player player, Event event) { + if (event == null) { + return player.getInventory().getHeldItemSlot(); + } if (CompatibleHand.getHand(event) == CompatibleHand.OFF_HAND) { return 40; }