diff --git a/src/main/java/de/jottyfan/minecraft/block/Itemhoarder.java b/src/main/java/de/jottyfan/minecraft/block/Itemhoarder.java
index c4fdc10..5805771 100644
--- a/src/main/java/de/jottyfan/minecraft/block/Itemhoarder.java
+++ b/src/main/java/de/jottyfan/minecraft/block/Itemhoarder.java
@@ -9,10 +9,8 @@ import de.jottyfan.minecraft.blockentity.ItemHoarderBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
@@ -23,6 +21,7 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootParams.Builder;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.BlockHitResult;
 
 /**
@@ -77,19 +76,14 @@ public class Itemhoarder extends Block implements EntityBlock {
 		List<ItemStack> list = new ArrayList<>();
 		list.add(new ItemStack(QuicklyBlocks.ITEMHOARDER));
 
-		// TODO: add content of spawnAfterBreak here?
-		return list;
-	}
-
-	@Override
-	protected void spawnAfterBreak(BlockState state, ServerLevel level, BlockPos pos, ItemStack tool,
-			boolean dropExperience) {
-		BlockEntity blockEntity = level.getBlockEntity(pos);
+		BlockEntity blockEntity = builder.getOptionalParameter(LootContextParams.BLOCK_ENTITY);
 		if (blockEntity instanceof ItemHoarderBlockEntity) {
 			ItemHoarderBlockEntity ihbe = (ItemHoarderBlockEntity) blockEntity;
 			for (ItemStack stack : ihbe.getStacks().values()) {
-				level.addFreshEntity(new ItemEntity(level, pos.getX(), pos.getY(), pos.getZ(), stack));
+				list.add(stack);
 			}
 		}
+		return list;
 	}
+
 }