Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't fire EntityDamageByEntityEvent when renaming (#1680)

Browse Source 
Fixes incompatibility with mcMMO's health bar displays
This commit is contained in:
Adam 2021-12-05 14:07:21 -05:00 committed by GitHub
parent 62a1006f02
commit a7cb4a0c78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
View File

@ -82,6 +82,9 @@ public class GriefPrevention extends JavaPlugin
//this handles data storage, like player and region data //this handles data storage, like player and region data
public DataStore dataStore; public DataStore dataStore;
// Event handlers with common functionality
EntityEventHandler entityEventHandler;
//this tracks item stacks expected to drop which will need protection //this tracks item stacks expected to drop which will need protection
ArrayList<PendingItemProtection> pendingItemWatchList = new ArrayList<>(); ArrayList<PendingItemProtection> pendingItemWatchList = new ArrayList<>();
@ -359,7 +362,7 @@ public class GriefPrevention extends JavaPlugin
pluginManager.registerEvents(blockEventHandler, this); pluginManager.registerEvents(blockEventHandler, this);
//entity events //entity events
EntityEventHandler entityEventHandler = new EntityEventHandler(this.dataStore, this); entityEventHandler = new EntityEventHandler(this.dataStore, this);
pluginManager.registerEvents(entityEventHandler, this); pluginManager.registerEvents(entityEventHandler, this);
//siege events //siege events

2
src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View File

@ -1350,7 +1350,7 @@ class PlayerEventHandler implements Listener
if (itemInHand.getType() == Material.NAME_TAG) if (itemInHand.getType() == Material.NAME_TAG)
{ {
EntityDamageByEntityEvent damageEvent = new EntityDamageByEntityEvent(player, entity, EntityDamageEvent.DamageCause.CUSTOM, 0); EntityDamageByEntityEvent damageEvent = new EntityDamageByEntityEvent(player, entity, EntityDamageEvent.DamageCause.CUSTOM, 0);
instance.getServer().getPluginManager().callEvent(damageEvent); instance.entityEventHandler.onEntityDamage(damageEvent);
if (damageEvent.isCancelled()) if (damageEvent.isCancelled())
{ {
event.setCancelled(true); event.setCancelled(true);