EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Fixes #3672, Fixes #3316, Fixes #3288, Fixes #2434, Fixes #1732, Fixes #1726, Fixes #1597, Fixes #941

Browse Source
This commit is contained in:
nossr50
2019-01-15 07:19:00 -08:00
parent 6ce44b7ce8
commit 12af9af902
5 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java
View File

@ -3,6 +3,7 @@ package com.gmail.nossr50.util;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.MobHealthbarType;
import com.gmail.nossr50.datatypes.meta.OldName;
import com.gmail.nossr50.datatypes.player.PlayerProfile;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.runnables.MobHealthDisplayUpdaterTask;
@ -13,6 +14,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.metadata.FixedMetadataValue;
import org.bukkit.metadata.MetadataValue;
public final class MobHealthbarUtils {
private MobHealthbarUtils() {}
@ -38,7 +40,7 @@ public final class MobHealthbarUtils {
* @param target the targetted entity
* @param damage damage done by the attack triggering this
*/
public static void handleMobHealthbars(Player player, LivingEntity target, double damage) {
public static void handleMobHealthbars(Player player, LivingEntity target, double damage, mcMMO plugin) {
if (mcMMO.isHealthBarPluginEnabled() || !Permissions.mobHealthDisplay(player) || !Config.getInstance().getMobHealthbarEnabled()) {
return;
}
@ -57,8 +59,16 @@ public final class MobHealthbarUtils {
return;
}
String originalName = target.getName();
String oldName = target.getCustomName();
/*
* Store the name in metadata
*/
if(target.getMetadata("mcMMO_oldName").size() <= 0 && originalName != null)
target.setMetadata("mcMMO_oldName", new OldName(originalName, plugin));
if (oldName == null) {
oldName = "";
}

4
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -703,7 +703,7 @@ public final class CombatUtils {
return tier;
}
public static void handleHealthbars(Entity attacker, LivingEntity target, double damage) {
public static void handleHealthbars(Entity attacker, LivingEntity target, double damage, mcMMO plugin) {
if (!(attacker instanceof Player)) {
return;
}
@ -718,6 +718,6 @@ public final class CombatUtils {
return;
}
MobHealthbarUtils.handleMobHealthbars(player, target, damage);
MobHealthbarUtils.handleMobHealthbars(player, target, damage, plugin);
}
}