From c781eca5c53a73757d87d5d8554766e4aec43a97 Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Wed, 18 Mar 2015 15:51:18 -0700 Subject: [PATCH] Fixed pvp rules applying where they shouldn't. --- src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index 720f90a..a967110 100644 --- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -797,6 +797,9 @@ class EntityEventHandler implements Listener EntityDamageByEntityEvent subEvent = (EntityDamageByEntityEvent) event; + //if not in a pvp rules world, do nothing + if(!GriefPrevention.instance.config_pvp_enabledWorlds.contains(defender.getWorld())) return; + //determine which player is attacking, if any Player attacker = null; Projectile arrow = null;