From b86f7c24ede95568c88883525519a998303dd607 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 19 Mar 2016 08:47:59 -0400 Subject: [PATCH] Fixed #677 --- .../java/WayofTime/bloodmagic/item/ItemBoundSword.java | 7 ++++--- .../WayofTime/bloodmagic/util/handler/EventHandler.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index 49f8786c..ef8456e3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -33,6 +33,7 @@ import WayofTime.bloodmagic.registry.ModItems; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; +import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; public class ItemBoundSword extends ItemSword implements IBindable, IActivatable, IMeshProvider @@ -105,11 +106,11 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable @Override public Multimap getAttributeModifiers(EntityEquipmentSlot equipmentSlot, ItemStack stack) { - Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); + Multimap multimap = HashMultimap.create(); if (equipmentSlot == EntityEquipmentSlot.MAINHAND) { - double damage = getActivated(stack) ? this.attackDamage : 1.0D; - multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", damage, 0)); + multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getActivated(stack) ? 12 : 2, 0)); + multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.4, 0)); } return multimap; } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java index edc58bd5..fdea0350 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java @@ -707,7 +707,7 @@ public class EventHandler if (entity != null && entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; - ItemStack heldStack = player.getActiveItemStack(); + ItemStack heldStack = player.getHeldItemMainhand(); if (heldStack != null && heldStack.getItem() instanceof IDemonWillWeapon && !player.worldObj.isRemote) { IDemonWillWeapon demonWillWeapon = (IDemonWillWeapon) heldStack.getItem();