From 21822164997742fbd1814d0abb2424d60ac3be73 Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Mon, 14 Sep 2015 20:06:49 -0700 Subject: [PATCH] Fixed invincible attack dogs. Fix: When vanilla PvP is on, but GP config says it's off in a world, dogs are invincible even though they can attack players. --- src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index 43cfc77..aea150f 100644 --- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -824,7 +824,7 @@ public class EntityEventHandler implements Listener } //otherwise the player damaging the entity must have permission, unless it's a dog in a pvp world - else if(!(GriefPrevention.instance.pvpRulesApply(event.getEntity().getWorld()) && event.getEntity().getType() == EntityType.WOLF)) + else if(!(event.getEntity().getWorld().getPVP() && event.getEntity().getType() == EntityType.WOLF)) { String noContainersReason = claim.allowContainers(attacker); if(noContainersReason != null)