From 150ed4c6a9c2e47cfcc98f2283d76473eedac84d Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 7 Jun 2016 21:11:21 -0400 Subject: [PATCH] Fixed separate NPE with the Sigil of Holding. Added possible fix to an Incense glitch. --- .../java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java | 2 +- .../WayofTime/bloodmagic/item/inventory/InventoryHolding.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index b7e3891f..65edfc5f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -77,7 +77,7 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider @Override public void onPlayerStoppedUsing(ItemStack stack, World worldIn, EntityLivingBase entityLiving, int timeLeft) { - if (entityLiving instanceof EntityPlayer) + if (entityLiving instanceof EntityPlayer && !entityLiving.worldObj.isRemote) PlayerSacrificeHelper.sacrificePlayerHealth((EntityPlayer) entityLiving); } diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java b/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java index 9357e5f2..0da6974e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java @@ -40,7 +40,7 @@ public class InventoryHolding extends ItemInventory { ItemStack itemStack = entityPlayer.inventory.getStackInSlot(i); - if (hasUUID(itemStack)) + if (itemStack != null && hasUUID(itemStack)) { if (itemStack.getTagCompound().getLong(Constants.NBT.MOST_SIG) == parentStackUUID.getMostSignificantBits() && itemStack.getTagCompound().getLong(Constants.NBT.LEAST_SIG) == parentStackUUID.getLeastSignificantBits()) { @@ -84,7 +84,7 @@ public class InventoryHolding extends ItemInventory public static boolean hasUUID(ItemStack itemStack) { - return itemStack.getTagCompound().hasKey(Constants.NBT.MOST_SIG) && itemStack.getTagCompound().hasKey(Constants.NBT.LEAST_SIG); + return itemStack.hasTagCompound() && itemStack.getTagCompound().hasKey(Constants.NBT.MOST_SIG) && itemStack.getTagCompound().hasKey(Constants.NBT.LEAST_SIG); } public static void setUUID(ItemStack itemStack)