From 5e0a390f483390e4ae645d8b3725dedd83896640 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 28 May 2016 07:19:43 -0400 Subject: [PATCH] Fixed Sigil of Magnetism and Call of the Zephyr picking up "dead" items. --- .../WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java | 3 +-- src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java index c3a6b45c..9f62f752 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java @@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; public class ItemSigilMagnetism extends ItemSigilToggleableBase { @@ -30,7 +29,7 @@ public class ItemSigilMagnetism extends ItemSigilToggleableBase for (EntityItem entity : entities) { - if (entity != null && !world.isRemote) + if (entity != null && !world.isRemote && !entity.isDead) { entity.onCollideWithPlayer(player); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java index 2a031c93..878b3846 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java @@ -58,6 +58,11 @@ public class RitualZephyr extends Ritual { for (EntityItem entityItem : itemList) { + if (entityItem.isDead) + { + continue; + } + ItemStack copyStack = entityItem.getEntityItem().copy(); int originalAmount = copyStack.stackSize; ItemStack newStack = Utils.insertStackIntoInventory(copyStack, (IInventory) tileInventory, EnumFacing.DOWN);