fix: guard against #1017

klikli-dev · Dec 21, 2023 · 37741a7 · 37741a7
1 parent 9a2ef81
commit 37741a7
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/java/com/klikli_dev/occultism/util/BlockEntityUtil.java b/src/main/java/com/klikli_dev/occultism/util/BlockEntityUtil.java
@@ -22,6 +22,7 @@
 
 package com.klikli_dev.occultism.util;
 
+import com.klikli_dev.occultism.Occultism;
 import com.klikli_dev.occultism.api.common.data.GlobalBlockPos;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -172,9 +173,14 @@ public static void onBlockChangeDropWithNbt(Block block, BlockState state, Level
     public static ItemStack getItemWithNbt(Block block, BlockGetter level, BlockPos pos) {
         ItemStack itemStack = new ItemStack(block);
         BlockEntity blockEntity = level.getBlockEntity(pos);
-        CompoundTag CompoundTag = blockEntity.serializeNBT();
-        if (!CompoundTag.isEmpty()) {
-            itemStack.addTagElement("BlockEntityTag", CompoundTag);
+
+        if(blockEntity != null) {
+            CompoundTag CompoundTag = blockEntity.serializeNBT();
+            if (!CompoundTag.isEmpty()) {
+                itemStack.addTagElement("BlockEntityTag", CompoundTag);
+            }
+        } else {
+            Occultism.LOGGER.warn("BlockEntity is null for block {} at pos {}, cannot get ItemStack with NBT", block, pos);
         }
 
         return itemStack;