From 8a9d88c9acdc7a7f0d9c5237987ca8b9b63dff60 Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Sun, 17 Jan 2021 17:19:07 +0000 Subject: [PATCH] Guard against null item entities in LivingDropsEvent, fixes #464 --- src/main/java/electroblob/wizardry/enchantment/Imbuement.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/electroblob/wizardry/enchantment/Imbuement.java b/src/main/java/electroblob/wizardry/enchantment/Imbuement.java index 7487ca3d..22b646ec 100644 --- a/src/main/java/electroblob/wizardry/enchantment/Imbuement.java +++ b/src/main/java/electroblob/wizardry/enchantment/Imbuement.java @@ -45,7 +45,8 @@ public interface Imbuement { public static void onLivingDropsEvent(LivingDropsEvent event){ // Instantly disenchants an imbued weapon if it is dropped when the player dies. for(EntityItem item : event.getDrops()){ - removeImbuements(item.getItem()); + // Apparently some mods don't behave and shove null items in the list, quite why I have no idea + if(item != null) removeImbuements(item.getItem()); } }