From ec6b9d4387b6e7444bf24fe15af5ad1d34475e9b Mon Sep 17 00:00:00 2001
From: gmcferrin <gjmcferrin@gmail.com>
Date: Thu, 10 Jan 2013 12:18:08 -0500
Subject: [PATCH] Attempted fix for CombatTag dupe glitch - don't apply AoE
 damage to NPCs.

---
 src/main/java/com/gmail/nossr50/util/Combat.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/gmail/nossr50/util/Combat.java b/src/main/java/com/gmail/nossr50/util/Combat.java
index a2a88e2ec..cd8fa4800 100644
--- a/src/main/java/com/gmail/nossr50/util/Combat.java
+++ b/src/main/java/com/gmail/nossr50/util/Combat.java
@@ -335,6 +335,12 @@ public class Combat {
         }
 
         for (Entity entity : target.getNearbyEntities(2.5, 2.5, 2.5)) {
+            if (entity instanceof Player) {
+                if (Misc.isCitizensNPC((Player) entity)) {
+                    continue;
+                }
+            }
+
             if (!(entity instanceof LivingEntity)) {
                 continue;
             }