From 59f545d5ce7271e073981731446a24e064048ee5 Mon Sep 17 00:00:00 2001
From: TfT_02 <tft_02@hotmail.com>
Date: Fri, 23 Aug 2013 15:09:42 +0200
Subject: [PATCH] Fixed FakeEntityDamageByEntityEvent not getting fired

---
 Changelog.txt                                  |  1 +
 .../gmail/nossr50/skills/taming/Taming.java    | 10 ----------
 .../gmail/nossr50/util/skills/CombatUtils.java | 18 +++++++++---------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 815e0103a..f19ce4790 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -20,6 +20,7 @@ Version 1.4.07-dev
  + Added new McMMOPlayerLevelChangeEvent, fired when a players level changes
  + Added new McMMOPlayerLevelDownEvent, fired when a player loses levels
  = Fixed bug which allowed players to bypass fishing's exploit prevention
+ = Fixed bug where FakeEntityDamageByEntityEvent wasn't being fired
  = Fixed bug with Skull Splitter not finding the locale string
  = Fixed issue where locale strings could cause the scoreboard header to be longer than 16 characters.
  = Fixed a bug with Beast Lore when the entity had no owner but was tamed.
diff --git a/src/main/java/com/gmail/nossr50/skills/taming/Taming.java b/src/main/java/com/gmail/nossr50/skills/taming/Taming.java
index 8b40b3eae..1e42b56c2 100644
--- a/src/main/java/com/gmail/nossr50/skills/taming/Taming.java
+++ b/src/main/java/com/gmail/nossr50/skills/taming/Taming.java
@@ -54,16 +54,6 @@ public class Taming {
         return damage / shockProofModifier;
     }
 
-    /**
-     * Apply the Sharpened Claws ability.
-     *
-     * @param damage The initial damage
-     * @return Damage with SharpenedClaws bonus damage
-     */
-    public static double sharpenedClaws(double damage) {
-        return damage + Taming.sharpenedClawsBonusDamage;
-    }
-
     public static void processHolyHound(Wolf wolf, double damage) {
         double modifiedHealth = Math.min(wolf.getHealth() + damage, wolf.getMaxHealth());
 
diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
index 16cfeaf73..35e90b65c 100644
--- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
@@ -75,18 +75,18 @@ public final class CombatUtils {
         }
 
         if (axesManager.canUseAxeMastery()) {
-            event.setDamage(axesManager.axeMasteryCheck(event.getDamage()));
+            dealDamage(target, axesManager.axeMasteryCheck(event.getDamage()), player);
         }
 
         if (axesManager.canCriticalHit(target)) {
-            event.setDamage(axesManager.criticalHitCheck(target, event.getDamage()));
+            dealDamage(target, axesManager.criticalHitCheck(target, event.getDamage()), player);
         }
 
         if (axesManager.canImpact(target)) {
             axesManager.impactCheck(target);
         }
         else if (axesManager.canGreaterImpact(target)) {
-            event.setDamage(axesManager.greaterImpactCheck(target, event.getDamage()));
+            dealDamage(target, axesManager.greaterImpactCheck(target, event.getDamage()), player);
         }
 
         if (axesManager.canUseSkullSplitter(target)) {
@@ -105,11 +105,11 @@ public final class CombatUtils {
         }
 
         if (unarmedManager.canUseIronArm()) {
-            event.setDamage(unarmedManager.ironArmCheck(event.getDamage()));
+            dealDamage(target, unarmedManager.ironArmCheck(event.getDamage()), player);
         }
 
         if (unarmedManager.canUseBerserk()) {
-            event.setDamage(unarmedManager.berserkDamage(event.getDamage()));
+            dealDamage(target, unarmedManager.berserkDamage(event.getDamage()), player);
         }
 
         if (unarmedManager.canDisarm(target)) {
@@ -128,11 +128,11 @@ public final class CombatUtils {
         }
 
         if (tamingManager.canUseSharpenedClaws()) {
-            event.setDamage(Taming.sharpenedClaws(event.getDamage()));
+            dealDamage(target, Taming.sharpenedClawsBonusDamage, master);
         }
 
         if (tamingManager.canUseGore()) {
-            event.setDamage(tamingManager.gore(target, event.getDamage()));
+            dealDamage(target, tamingManager.gore(target, event.getDamage()), master);
         }
 
         startGainXp(mcMMOPlayer, target, SkillType.TAMING);
@@ -143,7 +143,7 @@ public final class CombatUtils {
         ArcheryManager archeryManager = mcMMOPlayer.getArcheryManager();
 
         if (archeryManager.canSkillShot()) {
-            event.setDamage(archeryManager.skillShotCheck(event.getDamage()));
+            dealDamage(target, archeryManager.skillShotCheck(event.getDamage()), player);
         }
 
         if (target instanceof Player && SkillType.UNARMED.getPVPEnabled()) {
@@ -159,7 +159,7 @@ public final class CombatUtils {
         }
 
         if (archeryManager.canDaze(target)) {
-            event.setDamage(archeryManager.dazeCheck((Player) target, event.getDamage()));
+            dealDamage(target, archeryManager.dazeCheck((Player) target, event.getDamage()), player);
         }
 
         if (!arrow.hasMetadata(mcMMO.infiniteArrowKey) && archeryManager.canTrackArrows()) {