Skip to content

Commit

Permalink
Handle healthbars even when skills are disabled. Fixes #1194
Browse files Browse the repository at this point in the history
  • Loading branch information
gmcferrin committed Mar 3, 2014
1 parent 7b3869e commit 30f7521
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
1 change: 1 addition & 0 deletions Changelog.txt
Expand Up @@ -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.
Expand Down
Expand Up @@ -189,6 +189,7 @@ else if (attacker instanceof Tameable) {
}

CombatUtils.processCombatAttack(event, attacker, target);
CombatUtils.handleHealthbars(attacker, target, event.getDamage());
}

/**
Expand Down
23 changes: 14 additions & 9 deletions src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
Expand Up @@ -298,15 +298,6 @@ else if (entityType == EntityType.ARROW) {
}
}
}
else if (attacker instanceof Player) {
Player player = (Player) attacker;

if (Misc.isNPCEntity(player) || Misc.isNPCEntity(target)) {
return;
}

MobHealthbarUtils.handleMobHealthbars(player, target, event.getDamage());
}
}

/**
Expand Down Expand Up @@ -614,4 +605,18 @@ else if (mcMMO.getModManager().isCustomTool(inHand)) {

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);
}
}

0 comments on commit 30f7521

Please sign in to comment.