Add calls to addOrRemoveFromPlayerList

CitizensDev · Sep 11, 2015 · 72ba146 · 72ba146
1 parent 172249c
commit 72ba146
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -995,6 +995,7 @@ public void playerlist(CommandContext args, CommandSender sender, NPC npc) {
         if (npc.isSpawned()) {
             npc.despawn(DespawnReason.PENDING_RESPAWN);
             npc.spawn(npc.getTrait(CurrentLocation.class).getLocation());
+            NMS.addOrRemoveFromPlayerList(npc.getEntity(), remove);
         }
         Messaging.sendTr(sender, remove ? Messages.REMOVED_FROM_PLAYERLIST : Messages.ADDED_TO_PLAYERLIST,
                 npc.getName());

diff --git a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
@@ -352,7 +352,7 @@ private void updatePackets(boolean navigating) {
             for (int i = 0; i < 5; i++) {
                 packets[i] = new PacketPlayOutEntityEquipment(getId(), i, getEquipment(i));
             }
-
+            NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
             NMS.sendPacketsNearby(getBukkitEntity(), current, packets);
         }
     }

diff --git a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java
@@ -89,13 +89,12 @@ protected Entity createEntity(final Location at, final NPC npc) {
         handle.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
 
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-
             @Override
             public void run() {
-
                 if (getBukkitEntity() == null || !getBukkitEntity().isValid())
-                    return;
-
+                    return; 
+                boolean removeFromPlayerList = npc.data().get("removefromplayerlist", Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
+                NMS.addOrRemoveFromPlayerList(getBukkitEntity(), npc.data().get("removefromplayerlist", removeFromPlayerList));
                 if (prefixCapture != null) {
                     Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard();
                     String teamName = UUID.randomUUID().toString().substring(0, 16);