Skip to content

Commit 8eeab68

Browse files
authored
Merge pull request #381 from Blamo27/fix/npc-issue
Can't hit NPCs (Sentinel #249)
2 parents d2c52f7 + 2ae6f39 commit 8eeab68

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,11 @@ public void onDamageEntity(DamageEntityEvent event) {
479479
} else if (pvp) {
480480
Player defender = (Player) event.getEntity();
481481

482+
// if defender is an NPC
483+
if (defender.hasMetadata("NPC")) {
484+
return;
485+
}
486+
482487
canDamage = query.testBuild(target, associable, combine(event, DefaultFlag.PVP))
483488
&& query.queryState(playerAttacker.getLocation(), playerAttacker, combine(event, DefaultFlag.PVP)) != State.DENY
484489
&& query.queryState(target, playerAttacker, combine(event, DefaultFlag.PVP)) != State.DENY;

0 commit comments

Comments
 (0)