From c52f0b4da218d37f7c7423f11fa4b9933f437791 Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Fri, 3 Jun 2016 21:27:47 -0700 Subject: [PATCH] GPFlags: Allow pets be damaged in AllowPvP zones. --- .../ryanhamshire/GriefPrevention/EntityEventHandler.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index 1a8b92e..6fb7747 100644 --- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -864,7 +864,12 @@ public class EntityEventHandler implements Listener if(attacker.hasPermission("griefprevention.ignoreclaims")) message += " " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement); GriefPrevention.sendMessage(attacker, TextMode.Err, message); - event.setCancelled(true); + PreventPvPEvent pvpEvent = new PreventPvPEvent(new Claim(subEvent.getEntity().getLocation(), subEvent.getEntity().getLocation(), null, new ArrayList(), new ArrayList(), new ArrayList(), new ArrayList(), null)); + Bukkit.getPluginManager().callEvent(pvpEvent); + if(!pvpEvent.isCancelled()) + { + event.setCancelled(true); + } return; } //and disallow if attacker is pvp immune