From a7cb4a0c788436f9808acbb831627a282fde4744 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 5 Dec 2021 14:07:21 -0500 Subject: [PATCH] Don't fire EntityDamageByEntityEvent when renaming (#1680) Fixes incompatibility with mcMMO's health bar displays --- .../me/ryanhamshire/GriefPrevention/GriefPrevention.java | 5 ++++- .../me/ryanhamshire/GriefPrevention/PlayerEventHandler.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java index 6bb6480..a9176a7 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java @@ -82,6 +82,9 @@ public class GriefPrevention extends JavaPlugin //this handles data storage, like player and region data public DataStore dataStore; + // Event handlers with common functionality + EntityEventHandler entityEventHandler; + //this tracks item stacks expected to drop which will need protection ArrayList pendingItemWatchList = new ArrayList<>(); @@ -359,7 +362,7 @@ public class GriefPrevention extends JavaPlugin pluginManager.registerEvents(blockEventHandler, this); //entity events - EntityEventHandler entityEventHandler = new EntityEventHandler(this.dataStore, this); + entityEventHandler = new EntityEventHandler(this.dataStore, this); pluginManager.registerEvents(entityEventHandler, this); //siege events diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index 772d09a..9c49a8e 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -1350,7 +1350,7 @@ class PlayerEventHandler implements Listener if (itemInHand.getType() == Material.NAME_TAG) { EntityDamageByEntityEvent damageEvent = new EntityDamageByEntityEvent(player, entity, EntityDamageEvent.DamageCause.CUSTOM, 0); - instance.getServer().getPluginManager().callEvent(damageEvent); + instance.entityEventHandler.onEntityDamage(damageEvent); if (damageEvent.isCancelled()) { event.setCancelled(true);