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

Small tweak to prevent a possible annoyance.

Browse source
This commit is contained in:
WayofTime 2015-04-21 16:32:42 -04:00
parent 34f779563e
commit 3e53489162
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/alchemicalWizardry/api/items/ItemSpellMultiTool.java
View file

@ -56,8 +56,6 @@ public class ItemSpellMultiTool extends Item
float damage = this.getCustomItemAttack(par1ItemStack); float damage = this.getCustomItemAttack(par1ItemStack);
float f = (float)par3EntityLivingBase.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue(); float f = (float)par3EntityLivingBase.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue();
damage *= f;
SpellParadigmTool parad = this.loadParadigmFromStack(par1ItemStack); SpellParadigmTool parad = this.loadParadigmFromStack(par1ItemStack);
@ -73,6 +71,8 @@ public class ItemSpellMultiTool extends Item
damage *= 1.75f; damage *= 1.75f;
} }
damage *= f;
if (par3EntityLivingBase instanceof EntityPlayer) if (par3EntityLivingBase instanceof EntityPlayer)
{ {
par2EntityLivingBase.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) par3EntityLivingBase), damage); par2EntityLivingBase.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) par3EntityLivingBase), damage);