diff --git a/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java b/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java index cd12a04057..d389601d55 100644 --- a/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java +++ b/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java @@ -6,12 +6,14 @@ import net.minecraft.world.item.ItemStack; import net.minecraftforge.items.IItemHandlerModifiable; import top.theillusivec4.curios.api.CuriosApi; +import top.theillusivec4.curios.api.type.capability.ICuriosItemHandler; import top.theillusivec4.curios.api.type.inventory.ICurioStacksHandler; import wayoftime.bloodmagic.core.LivingArmorRegistrar; import wayoftime.bloodmagic.core.living.LivingStats; import wayoftime.bloodmagic.core.living.LivingUtil; import wayoftime.bloodmagic.impl.BloodMagicAPI; import java.util.Map; +import java.util.Optional; public class CuriosCompat { @@ -23,7 +25,11 @@ public void registerInventory() public NonNullList getCuriosInventory(Player player) { - IItemHandlerModifiable itemHandler = CuriosApi.getCuriosInventory(player).resolve().get().getEquippedCurios(); + Optional curioInv = CuriosApi.getCuriosInventory(player).resolve(); + if (curioInv.isEmpty()) { + return NonNullList.create(); + } + IItemHandlerModifiable itemHandler = curioInv.get().getEquippedCurios(); NonNullList inventory = NonNullList.create(); for (int i = 0; i < itemHandler.getSlots(); i++) {