diff --git a/src/main/java/lol/hyper/toolstats/events/EntityDamage.java b/src/main/java/lol/hyper/toolstats/events/EntityDamage.java index 0676426..7994115 100644 --- a/src/main/java/lol/hyper/toolstats/events/EntityDamage.java +++ b/src/main/java/lol/hyper/toolstats/events/EntityDamage.java @@ -39,7 +39,7 @@ public class EntityDamage implements Listener { private final ToolStats toolStats; public final Set trackedMobs = new HashSet<>(); - private final List ignoredCauses = Arrays.asList(EntityDamageEvent.DamageCause.SUICIDE, EntityDamageEvent.DamageCause.VOID, EntityDamageEvent.DamageCause.CUSTOM, EntityDamageEvent.DamageCause.KILL); + private final List ignoredDamageCauses = Arrays.asList("SUICIDE", "VOID", "CUSTOM", "KILL"); public EntityDamage(ToolStats toolStats) { this.toolStats = toolStats; @@ -57,8 +57,8 @@ public class EntityDamage implements Listener { LivingEntity mobBeingAttacked = (LivingEntity) event.getEntity(); // ignore void and /kill damage - EntityDamageEvent.DamageCause cause = event.getCause(); - if (ignoredCauses.contains(cause)) { + String cause = event.getCause().toString().toUpperCase(); + if (ignoredDamageCauses.contains(cause)) { return; } @@ -166,8 +166,8 @@ public class EntityDamage implements Listener { } // ignore void and /kill damage - EntityDamageEvent.DamageCause cause = event.getCause(); - if (ignoredCauses.contains(cause)) { + String cause = event.getCause().toString().toUpperCase(); + if (ignoredDamageCauses.contains(cause)) { return; } @@ -196,8 +196,8 @@ public class EntityDamage implements Listener { } // ignore void and /kill damage - EntityDamageEvent.DamageCause cause = event.getCause(); - if (ignoredCauses.contains(cause)) { + String cause = event.getCause().toString().toUpperCase(); + if (ignoredDamageCauses.contains(cause)) { return; } diff --git a/src/main/java/lol/hyper/toolstats/events/SheepShear.java b/src/main/java/lol/hyper/toolstats/events/SheepShear.java index 0d57a71..c39e05f 100644 --- a/src/main/java/lol/hyper/toolstats/events/SheepShear.java +++ b/src/main/java/lol/hyper/toolstats/events/SheepShear.java @@ -64,15 +64,14 @@ public class SheepShear implements Listener { return; } - Sheep sheep = (Sheep) entity; // make sure the sheep is not sheared + Sheep sheep = (Sheep) entity; if (sheep.isSheared()) { return; } // update the stats - ItemStack finalShears = shears; - addLore(finalShears); + addLore(shears); } private static @Nullable ItemStack getShears(Player player) {