EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 13:16:45 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.gmail.nossr50.mcMMO</groupId> <groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId> <artifactId>mcMMO</artifactId>
<version>2.1.125</version> <version>2.1.126-SNAPSHOT</version>
<name>mcMMO</name> <name>mcMMO</name>
<url>https://github.com/mcMMO-Dev/mcMMO</url> <url>https://github.com/mcMMO-Dev/mcMMO</url>
<scm> <scm>

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 * 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 * 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.processCombatAttack(event, attacker, target);
CombatUtils.handleHealthbars(attacker, target, event.getFinalDamage(), plugin); CombatUtils.handleHealthbars(attacker, target, event.getFinalDamage(), plugin);
}
/** @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = false)
* This sets entity names back to whatever they are supposed to be public void onEntityDamageMonitor(EntityDamageByEntityEvent entityDamageEvent) {
*/ if(entityDamageEvent.getEntity() instanceof LivingEntity) {
if(event.getFinalDamage() >= target.getHealth()) LivingEntity livingEntity = (LivingEntity) entityDamageEvent.getEntity();
{
if(attacker instanceof LivingEntity) if(entityDamageEvent.getFinalDamage() >= livingEntity.getHealth()) {
{
CombatUtils.fixNames((LivingEntity) attacker); /*
* 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) { public boolean checkParties(Cancellable event, Player defendingPlayer, Player attackingPlayer) {