Merge pull request #381 from Blamo27/fix/npc-issue

Can't hit NPCs (Sentinel #249)
EngineHub · Aug 4, 2018 · 8eeab68 · 8eeab68
2 parents d2c52f7 + 2ae6f39
commit 8eeab68
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...d-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java b/...d-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;