From efe1e6044a6aa41cd75bdd8628eb59e3e93b0b9a Mon Sep 17 00:00:00 2001 From: ABKQPO <93412322+ABKQPO@users.noreply.github.com> Date: Sat, 19 Apr 2025 22:38:37 +0800 Subject: [PATCH] Fix Mark of the Falling Tower does not check item stack and does not immediately remove entities (#75) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../common/rituals/RitualEffectSummonMeteor.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSummonMeteor.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSummonMeteor.java index 43d14960..09655a90 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSummonMeteor.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSummonMeteor.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; @@ -45,7 +46,10 @@ public class RitualEffectSummonMeteor extends RitualEffect { for (EntityItem entityItem : entities) { if (entityItem != null && MeteorRegistry.isValidMeteorFocusItem(entityItem.getEntityItem())) { - int meteorID = MeteorRegistry.getMeteorIDForItem(entityItem.getEntityItem()); + ItemStack stack = entityItem.getEntityItem(); + if (stack == null || stack.stackSize <= 0) continue; + + int meteorID = MeteorRegistry.getMeteorIDForItem(stack); int cost = MeteorRegistry.meteorList.get(meteorID).cost; if (currentEssence < cost) { @@ -63,7 +67,14 @@ public class RitualEffectSummonMeteor extends RitualEffect { } } - entityItem.setDead(); + stack.stackSize--; + + if (stack.stackSize <= 0) { + world.removeEntity(entityItem); + } else { + entityItem.setEntityItemStack(stack); + } + world.spawnEntityInWorld(meteor); ritualStone.setActive(false); SoulNetworkHandler.syphonFromNetwork(owner, cost);