From 3fea3f8d07f4262129446aa47c67f3ff0d33982f Mon Sep 17 00:00:00 2001 From: Saereth Date: Thu, 11 Dec 2025 00:09:19 -0800 Subject: [PATCH] Fixed curio related logspam Fixes #2085 Added null-safety checks: 1. Check if curioInv.isEmpty() before calling .get() 2. Check if livingArmourSockets == null before using it --- .../java/wayoftime/bloodmagic/compat/CuriosCompat.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java b/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java index d389601d55..0507a93f8a 100644 --- a/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java +++ b/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java @@ -40,7 +40,14 @@ public NonNullList getCuriosInventory(Player player) public int recalculateCuriosSlots(Player player) { - ICurioStacksHandler livingArmourSockets = CuriosApi.getCuriosInventory(player).resolve().get().getCurios().get("living_armour_socket"); + Optional curioInv = CuriosApi.getCuriosInventory(player).resolve(); + if (curioInv.isEmpty()) { + return 0; + } + ICurioStacksHandler livingArmourSockets = curioInv.get().getCurios().get("living_armour_socket"); + if (livingArmourSockets == null) { + return 0; + } if (LivingUtil.hasFullSet(player)) { LivingStats stats = LivingStats.fromPlayer(player);