diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java b/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java index ba2db033..88a3721f 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java @@ -455,7 +455,8 @@ public void onDamageEntity(DamageEntityEvent event) { Player defender = (Player) event.getEntity(); canDamage = query.testBuild(target, associable, combine(event, DefaultFlag.PVP)) - && query.queryState(playerAttacker.getLocation(), playerAttacker, combine(event, DefaultFlag.PVP)) != State.DENY; + && query.queryState(playerAttacker.getLocation(), playerAttacker, combine(event, DefaultFlag.PVP)) != State.DENY + && query.queryState(target, playerAttacker, combine(event, DefaultFlag.PVP)) != State.DENY; // Fire the disallow PVP event if (!canDamage && Events.fireAndTestCancel(new DisallowedPVPEvent(playerAttacker, defender, event.getOriginalEvent()))) {