From 30f7521a3ade7f1ded893e5e7819980c93297b33 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Mon, 3 Mar 2014 10:29:14 -0500
Subject: [PATCH] Handle healthbars even when skills are disabled. Fixes #1194

---
 Changelog.txt                                 |  1 +
 .../nossr50/listeners/EntityListener.java     |  1 +
 .../nossr50/util/skills/CombatUtils.java      | 23 +++++++++++--------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 44d0a0e68..d5c35c54e 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -21,6 +21,7 @@ Version 1.4.08-dev
  + Added new experience bonus perk 'mcmmo.perks.xp.customboost.<skillname>' multiplies incoming XP by the boost amount defined in the experience config
  + Added Ender Dragon, Wither, and Witch to combat experience multipliers - they do not give XP by default
  + Added support for multiple mod config files, naming can be done as either armor.<modname>.yml or <modname>.armor.yml
+ = Fixed bug where healthbars wouldn't display if skills were disabled
  = Fixed bug with Call of The Wild entities despawning
  = Fixed bug with updating (very) old user data.
  = Fixed bug with checking maximum durability of mod items.
diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
index 6094c1395..1d6a5cbd3 100644
--- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
@@ -189,6 +189,7 @@ public class EntityListener implements Listener {
         }
 
         CombatUtils.processCombatAttack(event, attacker, target);
+        CombatUtils.handleHealthbars(attacker, target, event.getDamage());
     }
 
     /**
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 b4c9a4556..554a4492b 100644
--- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
@@ -298,15 +298,6 @@ public final class CombatUtils {
                 }
             }
         }
-        else if (attacker instanceof Player) {
-            Player player = (Player) attacker;
-
-            if (Misc.isNPCEntity(player) || Misc.isNPCEntity(target)) {
-                return;
-            }
-
-            MobHealthbarUtils.handleMobHealthbars(player, target, event.getDamage());
-        }
     }
 
     /**
@@ -614,4 +605,18 @@ public final class CombatUtils {
 
         return tier;
     }
+
+    public static void handleHealthbars(Entity attacker, LivingEntity target, double damage) {
+        if (!(attacker instanceof Player)) {
+            return;
+        }
+
+        Player player = (Player) attacker;
+
+        if (Misc.isNPCEntity(player) || Misc.isNPCEntity(target)) {
+            return;
+        }
+
+        MobHealthbarUtils.handleMobHealthbars(player, target, damage);
+    }
 }