From 73d0b377ae26650b10200edb351985cb4203398f Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Wed, 28 Aug 2013 11:29:30 -0400
Subject: [PATCH] Reduce code duplication. Also verify that our target is alive
 before trying to damage them.

Fixes #1403
---
 .../nossr50/util/skills/CombatUtils.java      | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

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 538d8fa92..929852d9a 100644
--- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
@@ -348,18 +348,7 @@ public final class CombatUtils {
      * @param damage Amount of damage to attempt to do
      */
     public static void dealDamage(LivingEntity target, double damage) {
-        if (Config.getInstance().getEventCallbackEnabled()) {
-            EntityDamageEvent ede = new FakeEntityDamageEvent(target, DamageCause.CUSTOM, damage);
-            mcMMO.p.getServer().getPluginManager().callEvent(ede);
-
-            if (ede.isCancelled()) {
-                return;
-            }
-
-            damage = ede.getDamage();
-        }
-
-        target.damage(damage);
+        dealDamage(target, damage, DamageCause.CUSTOM, null);
     }
 
     /**
@@ -381,15 +370,19 @@ public final class CombatUtils {
      * @param attacker Player to pass to event as damager
      */
     public static void dealDamage(LivingEntity target, double damage, DamageCause cause, Entity attacker) {
-        if (Config.getInstance().getEventCallbackEnabled()) {
-            EntityDamageEvent ede = new FakeEntityDamageByEntityEvent(attacker, target, cause, damage);
-            mcMMO.p.getServer().getPluginManager().callEvent(ede);
+        if (target.isDead()) {
+            return;
+        }
 
-            if (ede.isCancelled()) {
+        if (Config.getInstance().getEventCallbackEnabled()) {
+            EntityDamageEvent damageEvent = attacker == null ? new FakeEntityDamageEvent(target, cause, damage) : new FakeEntityDamageByEntityEvent(attacker, target, cause, damage);
+            mcMMO.p.getServer().getPluginManager().callEvent(damageEvent);
+
+            if (damageEvent.isCancelled()) {
                 return;
             }
 
-            damage = ede.getDamage();
+            damage = damageEvent.getDamage();
         }
 
         target.damage(damage);