Refactor

Move the playerlsit packet handling to the NMS class
CitizensDev · Dec 7, 2014 · 315bd72 · 315bd72
1 parent 5690a7f
commit 315bd72
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 27 deletions.
diff --git a/src/main/java/net/citizensnpcs/EventListen.java b/src/main/java/net/citizensnpcs/EventListen.java
@@ -276,19 +276,15 @@ public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
     public void onPlayerJoin(final PlayerJoinEvent event) {
         for (NPC npc : getAllNPCs()) {
             if (npc.isSpawned() && npc.getEntity().getType() == EntityType.PLAYER) {
-                ((CraftPlayer)event.getPlayer()).getHandle().playerConnection.sendPacket(
-                        new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, ((CraftPlayer) npc
-                        .getEntity()).getHandle()));
+                NMS.sendPlayerlistPacket(true, event.getPlayer(), npc);
             }
         }
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
             @Override
             public void run() {
                 for (NPC npc : getAllNPCs()) {
                     if (npc.isSpawned() && npc.getEntity().getType() == EntityType.PLAYER) {
-                        ((CraftPlayer)event.getPlayer()).getHandle().playerConnection.sendPacket(
-                                new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.REMOVE_PLAYER, ((CraftPlayer) npc
-                                .getEntity()).getHandle()));
+                        NMS.sendPlayerlistPacket(false, event.getPlayer(), npc);
                     }
                 }
             }

diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java
@@ -16,27 +16,7 @@
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.npc.entity.EntityHumanNPC;
 import net.citizensnpcs.npc.network.EmptyChannel;
-import net.minecraft.server.v1_8_R1.AttributeInstance;
-import net.minecraft.server.v1_8_R1.Block;
-import net.minecraft.server.v1_8_R1.BlockPosition;
-import net.minecraft.server.v1_8_R1.ControllerJump;
-import net.minecraft.server.v1_8_R1.DamageSource;
-import net.minecraft.server.v1_8_R1.EnchantmentManager;
-import net.minecraft.server.v1_8_R1.Entity;
-import net.minecraft.server.v1_8_R1.EntityHorse;
-import net.minecraft.server.v1_8_R1.EntityHuman;
-import net.minecraft.server.v1_8_R1.EntityInsentient;
-import net.minecraft.server.v1_8_R1.EntityLiving;
-import net.minecraft.server.v1_8_R1.EntityMinecartAbstract;
-import net.minecraft.server.v1_8_R1.EntityPlayer;
-import net.minecraft.server.v1_8_R1.EntityTypes;
-import net.minecraft.server.v1_8_R1.GenericAttributes;
-import net.minecraft.server.v1_8_R1.MathHelper;
-import net.minecraft.server.v1_8_R1.NavigationAbstract;
-import net.minecraft.server.v1_8_R1.NetworkManager;
-import net.minecraft.server.v1_8_R1.Packet;
-import net.minecraft.server.v1_8_R1.PathfinderGoalSelector;
-import net.minecraft.server.v1_8_R1.World;
+import net.minecraft.server.v1_8_R1.*;
 
 import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
@@ -47,6 +27,7 @@
 import org.bukkit.craftbukkit.v1_8_R1.CraftSound;
 import org.bukkit.craftbukkit.v1_8_R1.CraftWorld;
 import org.bukkit.craftbukkit.v1_8_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Horse;
 import org.bukkit.entity.LivingEntity;
@@ -519,6 +500,12 @@ public static void updateNavigationWorld(org.bukkit.entity.Entity entity, org.bu
         }
     }
 
+    public static void sendPlayerlistPacket(boolean showInPlayerlist, Player player, NPC npc) {
+        ((CraftPlayer)player).getHandle().playerConnection.sendPacket(
+                new PacketPlayOutPlayerInfo(showInPlayerlist ? EnumPlayerInfoAction.ADD_PLAYER:
+                        EnumPlayerInfoAction.REMOVE_PLAYER, ((CraftPlayer) npc.getEntity()).getHandle()));
+    }
+
     public static void updatePathfindingRange(NPC npc, float pathfindingRange) {
         if (!npc.isSpawned() || !npc.getEntity().getType().isAlive())
             return;