From 3d61cec07b2ce4f8f530bdc4388fcabeb21723f1 Mon Sep 17 00:00:00 2001
From: mcmonkey4eva <agoodwin@freneticllc.com>
Date: Sat, 2 Sep 2017 15:27:04 -0700
Subject: [PATCH] allow player NPCs in mobprox

---
 .../java/net/aufdemrand/denizen/npc/traits/MobproxTrait.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/npc/traits/MobproxTrait.java b/plugin/src/main/java/net/aufdemrand/denizen/npc/traits/MobproxTrait.java
index 438c462964..bb6abe6e78 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/npc/traits/MobproxTrait.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/npc/traits/MobproxTrait.java
@@ -52,7 +52,8 @@ public void run() {
                     List<Entity> removeme = new ArrayList<Entity>();
                     removeme.addAll(inrange);
                     for (Entity ent : nearby) {
-                        if (ent instanceof LivingEntity && !(ent instanceof Player) && (acceptnpc || (!dEntity.isCitizensNPC(ent)))) {
+                        if (ent instanceof LivingEntity && (!(ent instanceof Player) || dEntity.isCitizensNPC(ent))
+                                && (acceptnpc || (!dEntity.isCitizensNPC(ent)))) {
                             if (removeme.contains(ent)) {
                                 removeme.remove(ent);
                             }