DocRock3r/ToolStats
1
0
Fork 0
mirror of https://github.com/hyperdefined/ToolStats.git synced 2026-01-30 01:01:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

better handling of /kill

Browse Source 
apparently minecraft:kill runs in multiple entity damage events?
This commit is contained in:
hyperdefined
2022-08-19 18:27:34 -04:00
parent a89b9d6f6a
commit 9973d743a5
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/lol/hyper/toolstats/events/EntityDamage.java
View File

@@ -49,6 +49,7 @@ public class EntityDamage implements Listener {
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
} }
if (!(event.getEntity() instanceof LivingEntity)) { if (!(event.getEntity() instanceof LivingEntity)) {
return; return;
} }
@@ -148,6 +149,13 @@ public class EntityDamage implements Listener {
if (!(event.getEntity() instanceof LivingEntity)) { if (!(event.getEntity() instanceof LivingEntity)) {
return; return;
} }
// ignore void and /kill damage
EntityDamageEvent.DamageCause cause = event.getCause();
if (cause == EntityDamageEvent.DamageCause.SUICIDE || cause == EntityDamageEvent.DamageCause.VOID) {
return;
}
LivingEntity livingEntity = (LivingEntity) event.getEntity(); LivingEntity livingEntity = (LivingEntity) event.getEntity();
// player is taken damage but not being killed // player is taken damage but not being killed
if (livingEntity instanceof Player) { if (livingEntity instanceof Player) {
@@ -171,6 +179,13 @@ public class EntityDamage implements Listener {
if (!(event.getEntity() instanceof LivingEntity)) { if (!(event.getEntity() instanceof LivingEntity)) {
return; return;
} }
// ignore void and /kill damage
EntityDamageEvent.DamageCause cause = event.getCause();
if (cause == EntityDamageEvent.DamageCause.SUICIDE || cause == EntityDamageEvent.DamageCause.VOID) {
return;
}
LivingEntity livingEntity = (LivingEntity) event.getEntity(); LivingEntity livingEntity = (LivingEntity) event.getEntity();
// player is taken damage but not being killed // player is taken damage but not being killed
if (livingEntity instanceof Player) { if (livingEntity instanceof Player) {