From fab71ba2fece1f018b10eac7aa0de1aeb22b2ecf Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 27 Jul 2024 20:41:18 +0100 Subject: Fix NPE in the moved bauble event handler (#2775) --- src/main/java/gtPlusPlus/core/common/CommonProxy.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index 12f0971e73..90b4c99ed8 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -227,15 +227,20 @@ public class CommonProxy { return; } InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); + if (baubles == null) { + return; + } final ItemStack bauble1 = baubles.getStackInSlot(1); - if (bauble1.getItem() instanceof BaseBauble gtBauble && gtBauble.getDamageNegations() - .contains(event.source.damageType)) { + if (bauble1 != null && bauble1.getItem() instanceof BaseBauble gtBauble + && gtBauble.getDamageNegations() + .contains(event.source.damageType)) { event.setCanceled(true); return; } final ItemStack bauble2 = baubles.getStackInSlot(2); - if (bauble2.getItem() instanceof BaseBauble gtBauble && gtBauble.getDamageNegations() - .contains(event.source.damageType)) { + if (bauble2 != null && bauble2.getItem() instanceof BaseBauble gtBauble + && gtBauble.getDamageNegations() + .contains(event.source.damageType)) { event.setCanceled(true); } } -- cgit