From 1768f8740538d01105d4de844a826e3496e25800 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Fri, 26 Oct 2012 16:07:06 +0800
Subject: [PATCH] Use setting more consistently

---
 .../java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java   | 2 +-
 src/main/java/net/citizensnpcs/util/NMS.java                 | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
index 3cffec4da..6f622703e 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
@@ -39,7 +39,7 @@ public class CitizensHumanNPC extends CitizensNPC implements Equipable {
                 // minecraft will not update it.
                 boolean removeFromPlayerList = Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean();
                 NMS.addOrRemoveFromPlayerList(getBukkitEntity(),
-                        removeFromPlayerList || data().get("removefromplayerlist", removeFromPlayerList));
+                        data().get("removefromplayerlist", removeFromPlayerList));
             }
         }, 5);
         handle.getBukkitEntity().setSleepingIgnored(true);
diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java
index 93bfed237..6b6b4b48c 100644
--- a/src/main/java/net/citizensnpcs/util/NMS.java
+++ b/src/main/java/net/citizensnpcs/util/NMS.java
@@ -51,10 +51,11 @@ public class NMS {
         EntityLiving handle = ((CraftLivingEntity) bukkitEntity).getHandle();
         if (handle.world == null)
             return;
-        if (remove)
+        if (remove) {
             handle.world.players.remove(handle);
-        else
+        } else {
             handle.world.players.add(handle);
+        }
     }
 
     public static void attack(EntityLiving handle, EntityLiving target) {