diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 09df34820..6d15d6f4e 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -77,7 +77,7 @@ public class mcMMO extends JavaPlugin { /* Plugin Checks */ private static boolean combatTagEnabled; - private static boolean healthBarEnabled; + private static boolean healthBarPluginEnabled; // Config Validation Check public boolean noErrorsInConfigFiles = true; @@ -118,9 +118,9 @@ public class mcMMO extends JavaPlugin { } combatTagEnabled = getServer().getPluginManager().getPlugin("CombatTag") != null; - healthBarEnabled = getServer().getPluginManager().getPlugin("HealthBar") != null; + healthBarPluginEnabled = getServer().getPluginManager().getPlugin("HealthBar") != null; - if (healthBarEnabled) { + if (healthBarPluginEnabled) { getLogger().info("HealthBar plugin found, mcMMO's healthbars are automatically disabled."); } @@ -266,8 +266,8 @@ public class mcMMO extends JavaPlugin { return combatTagEnabled; } - public static boolean isHealthBarEnabled() { - return healthBarEnabled; + public static boolean isHealthBarPluginEnabled() { + return healthBarPluginEnabled; } /** diff --git a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java b/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java index 7a95f4d7e..3323a474b 100644 --- a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java +++ b/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java @@ -40,7 +40,7 @@ public final class MobHealthbarUtils { * @param damage damage done by the attack triggering this */ public static void handleMobHealthbars(Player player, LivingEntity target, double damage) { - if (!mcMMO.isHealthBarEnabled() || !Permissions.mobHealthDisplay(player)) { + if (mcMMO.isHealthBarPluginEnabled() || !Permissions.mobHealthDisplay(player)) { return; }