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

move namefix to monitor

Browse Source
This commit is contained in:
nossr50
2020-03-21 20:24:40 -07:00
parent 8fc3643803
commit e8021e81e6
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -410,6 +410,7 @@ public class EntityListener implements Listener {
}
}
/*
* This was put here to solve a plugin conflict with a mod called Project Korra
* Project Korra sends out a damage event with exactly 0 damage
@ -425,20 +426,21 @@ public class EntityListener implements Listener {
CombatUtils.processCombatAttack(event, attacker, target);
CombatUtils.handleHealthbars(attacker, target, event.getFinalDamage(), plugin);
}
/**
* This sets entity names back to whatever they are supposed to be
*/
if(event.getFinalDamage() >= target.getHealth())
{
if(attacker instanceof LivingEntity)
{
CombatUtils.fixNames((LivingEntity) attacker);
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = false)
public void onEntityDamageMonitor(EntityDamageByEntityEvent entityDamageEvent) {
if(entityDamageEvent.getEntity() instanceof LivingEntity) {
LivingEntity livingEntity = (LivingEntity) entityDamageEvent.getEntity();
if(entityDamageEvent.getFinalDamage() >= livingEntity.getHealth()) {
/*
* This sets entity names back to whatever they are supposed to be
*/
CombatUtils.fixNames(livingEntity);
}
}
CombatUtils.fixNames(target);
}
}
public boolean checkParties(Cancellable event, Player defendingPlayer, Player attackingPlayer) {