Fix Tinkers ActiveToolMod ignoring other mods already calculated dama…

…ge (although it should always be calculated first) #1398
SlimeKnights · Feb 14, 2015 · 3473d7a · 3473d7a
1 parent 8199401
commit 3473d7a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/tconstruct/tools/TActiveOmniMod.java b/src/main/java/tconstruct/tools/TActiveOmniMod.java
@@ -251,7 +251,7 @@ private void slimify(ToolCore tool, NBTTagCompound tags, Block block, int x, int
     @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 int attackDamage (int modDamage, int currentDamage, ToolCore tool, NBTTag
     @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");