From 3473d7a46924c9c2bb9f30c187b12082418e9149 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sat, 14 Feb 2015 23:54:48 +0100 Subject: [PATCH] Fix Tinkers ActiveToolMod ignoring other mods already calculated damage (although it should always be calculated first) #1398 --- src/main/java/tconstruct/tools/TActiveOmniMod.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/tconstruct/tools/TActiveOmniMod.java b/src/main/java/tconstruct/tools/TActiveOmniMod.java index 5a4b5c82..05481b8c 100644 --- a/src/main/java/tconstruct/tools/TActiveOmniMod.java +++ b/src/main/java/tconstruct/tools/TActiveOmniMod.java @@ -251,7 +251,7 @@ public class TActiveOmniMod extends ActiveToolMod @Override public int attackDamage (int modDamage, int currentDamage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) { - int bonus = 0; + int bonus = modDamage; if (entity instanceof EntityLivingBase) { EnumCreatureAttribute attribute = ((EntityLivingBase) entity).getCreatureAttribute(); @@ -285,7 +285,7 @@ public class TActiveOmniMod extends ActiveToolMod @Override public float knockback (float modKnockback, float currentKnockback, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity) { - float bonus = 0f; + float bonus = modKnockback; if (toolTags.hasKey("Knockback")) { float level = toolTags.getFloat("Knockback");