Attempted fix for CombatTag dupe glitch - don't apply AoE damage to

NPCs.

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;
             }