From 7c441bdefd6ac20bec345aa47f38949c48299b41 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Wed, 8 Oct 2014 01:12:22 +0800
Subject: [PATCH] Send tablist packet globally

---
 .../npc/entity/EntityHumanNPC.java            | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
index e2cde3f5c..762d03386 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
@@ -134,6 +134,23 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
         return controllerJump;
     }
 
+    private Packet getListPacket(boolean removeFromPlayerList) {
+        if (PLAYER_INFO_CONSTRUCTOR != null) {
+            try {
+                return PLAYER_INFO_CONSTRUCTOR.newInstance(getBukkitEntity().getPlayerListName(),
+                        !removeFromPlayerList, removeFromPlayerList ? 9999 : ping);
+            } catch (Exception e) {
+            }
+        } else {
+            try {
+                return (Packet) (removeFromPlayerList ? PLAYER_INFO_REMOVE_METHOD.invoke(null, getBukkitEntity()
+                        .getHandle()) : PLAYER_INFO_ADD_METHOD.invoke(null, getBukkitEntity().getHandle()));
+            } catch (Exception e) {
+            }
+        }
+        return null;
+    }
+
     public Navigation getNavigation() {
         return navigation;
     }
@@ -260,9 +277,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
     private void updatePackets(boolean navigating) {
         if (world.getWorld().getFullTime() % Setting.PACKET_UPDATE_DELAY.asInt() == 0) {
             Location current = getBukkitEntity().getLocation(packetLocationCache);
-            Packet[] packets = new Packet[navigating ? 6 : 7];
+            Packet[] packets = new Packet[navigating ? 5 : 6];
             if (!navigating) {
-                packets[6] = new PacketPlayOutEntityHeadRotation(this,
+                packets[5] = new PacketPlayOutEntityHeadRotation(this,
                         (byte) MathHelper.d(NMS.getHeadYaw(this) * 256.0F / 360.0F));
             }
             for (int i = 0; i < 5; i++) {
@@ -276,20 +293,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
             if (useListName != this.useListName || this.useListName == -1) {
                 this.useListName = useListName;
             }
-            if (PLAYER_INFO_CONSTRUCTOR != null) {
-                try {
-                    packets[5] = PLAYER_INFO_CONSTRUCTOR.newInstance(getBukkitEntity().getPlayerListName(),
-                            !removeFromPlayerList, removeFromPlayerList ? 9999 : ping);
-                } catch (Exception e) {
-                }
-            } else {
-                try {
-                    packets[5] = (Packet) (removeFromPlayerList ? PLAYER_INFO_REMOVE_METHOD.invoke(null,
-                            getBukkitEntity().getHandle()) : PLAYER_INFO_ADD_METHOD.invoke(null, getBukkitEntity()
-                            .getHandle()));
-                } catch (Exception e) {
-                }
-            }
+            NMS.sendToOnline(getListPacket(removeFromPlayerList));
             NMS.sendPacketsNearby(getBukkitEntity(), current, packets);
         }
     }