From 3e53489162bf47fae9e1bf27cd1d40bec3278f92 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 21 Apr 2015 16:32:42 -0400 Subject: [PATCH] Small tweak to prevent a possible annoyance. --- .../alchemicalWizardry/api/items/ItemSpellMultiTool.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/items/ItemSpellMultiTool.java b/src/main/java/WayofTime/alchemicalWizardry/api/items/ItemSpellMultiTool.java index ecce9ec1..c9335a0d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/ItemSpellMultiTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/ItemSpellMultiTool.java @@ -56,8 +56,6 @@ public class ItemSpellMultiTool extends Item float damage = this.getCustomItemAttack(par1ItemStack); float f = (float)par3EntityLivingBase.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue(); - - damage *= f; SpellParadigmTool parad = this.loadParadigmFromStack(par1ItemStack); @@ -73,6 +71,8 @@ public class ItemSpellMultiTool extends Item damage *= 1.75f; } + damage *= f; + if (par3EntityLivingBase instanceof EntityPlayer) { par2EntityLivingBase.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) par3EntityLivingBase), damage);