lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix bound tools not checking if they're bound (#1114)

Browse source 
(cherry picked from commit 3134f6b)
This commit is contained in:
Nicholas Ignoffo 2017-03-28 18:40:24 -07:00
parent 692c69865a
commit dd2c6915f3
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java
View file

@ -73,6 +73,11 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable
@Override @Override
public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) 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) if (entity instanceof EntityPlayer && getActivated(stack) && world.getTotalWorldTime() % 80 == 0)
NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage((EntityPlayer) entity, 20); NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage((EntityPlayer) entity, 20);
} }

5
src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java
View file

@ -89,6 +89,11 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable
@Override @Override
public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) 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()) if (entity instanceof EntityPlayer && getActivated(stack) && isSelected && getBeingHeldDown(stack) && stack == ((EntityPlayer) entity).getActiveItemStack())
{ {
EntityPlayer player = (EntityPlayer) entity; EntityPlayer player = (EntityPlayer) entity;