From dd2c6915f33e3d76bff774d7e149bf64c8dd37a8 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 28 Mar 2017 18:40:24 -0700 Subject: [PATCH] Fix bound tools not checking if they're bound (#1114) (cherry picked from commit 3134f6b) --- src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java | 5 +++++ src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index 4664a5b3..3b260e78 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -73,6 +73,11 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable @Override public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { + if (Strings.isNullOrEmpty(getOwnerUUID(stack))) { + setActivatedState(stack, false); + return; + } + if (entity instanceof EntityPlayer && getActivated(stack) && world.getTotalWorldTime() % 80 == 0) NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage((EntityPlayer) entity, 20); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index 7bcb7232..300c8722 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -89,6 +89,11 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable @Override public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { + if (Strings.isNullOrEmpty(getOwnerUUID(stack))) { + setActivatedState(stack, false); + return; + } + if (entity instanceof EntityPlayer && getActivated(stack) && isSelected && getBeingHeldDown(stack) && stack == ((EntityPlayer) entity).getActiveItemStack()) { EntityPlayer player = (EntityPlayer) entity;