diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java index 2b6490584..7280d8653 100644 --- a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java @@ -479,6 +479,11 @@ public void onDamageEntity(DamageEntityEvent event) { } else if (pvp) { Player defender = (Player) event.getEntity(); + // if defender is an NPC + if (defender.hasMetadata("NPC")) { + return; + } + canDamage = query.testBuild(target, associable, combine(event, DefaultFlag.PVP)) && query.queryState(playerAttacker.getLocation(), playerAttacker, combine(event, DefaultFlag.PVP)) != State.DENY && query.queryState(target, playerAttacker, combine(event, DefaultFlag.PVP)) != State.DENY;