fix: fix advancements not firing for sacrificing item in the cradle

Elenterius · May 2, 2023 · 9566f3d · 9566f3d
1 parent bda3d1c
commit 9566f3d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/com/github/elenterius/biomancy/block/cradle/PrimordialCradleBlock.java b/src/main/java/com/github/elenterius/biomancy/block/cradle/PrimordialCradleBlock.java
@@ -138,7 +138,6 @@ public void entityInside(BlockState state, Level level, BlockPos pos, Entity ent
 				else if (stack.getItem() instanceof PotionItem) {
 					entity.spawnAtLocation(new ItemStack(Items.GLASS_BOTTLE));
 				}
-				//				stack.shrink(1);
 			}
 		}
 	}
@@ -147,10 +146,10 @@ private boolean increaseFillLevel(@Nullable Player player, Level level, BlockPos
 		if (!stack.isEmpty() && !level.isClientSide()) {
 			if (EXPENSIVE_ITEMS.test(stack)) return false;
 
-			BlockEntity blockEntity = level.getBlockEntity(pos);
-			if (blockEntity instanceof PrimordialCradleBlockEntity creator && !creator.isFull() && creator.insertItem(stack)) {
-				if (player != null) {
-					ModTriggers.SACRIFICED_ITEM_TRIGGER.trigger((ServerPlayer) player, stack);
+			ItemStack copyOfStack = ItemHandlerHelper.copyStackWithSize(stack, 1); //creator#insertItem modifies the stack which may lead to it being empty
+			if (level.getBlockEntity(pos) instanceof PrimordialCradleBlockEntity creator && !creator.isFull() && creator.insertItem(stack)) {
+				if (player instanceof ServerPlayer serverPlayer) {
+					ModTriggers.SACRIFICED_ITEM_TRIGGER.trigger(serverPlayer, copyOfStack);
 				}
 				SoundEvent soundEvent = creator.isFull() ? ModSoundEvents.CREATOR_BECAME_FULL.get() : ModSoundEvents.CREATOR_EAT.get();
 				SoundUtil.broadcastBlockSound((ServerLevel) level, pos, soundEvent);

diff --git a/src/main/java/com/github/elenterius/biomancy/block/cradle/PrimordialCradleBlockEntity.java b/src/main/java/com/github/elenterius/biomancy/block/cradle/PrimordialCradleBlockEntity.java
@@ -64,6 +64,9 @@ public static void serverTick(Level level, BlockPos pos, BlockState state, Primo
 		}
 	}
 
+	/**
+	 * modifies the stack
+	 */
 	public boolean insertItem(ItemStack stack) {
 		if (level == null || level.isClientSide() || stack.isEmpty()) return false;
 		if (sacrificeHandler.isFull()) return false;