Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-04 18:00:00 +01:00
Code Issues Projects Releases Wiki Activity

Make some minor adjustments

Browse Source
This commit is contained in:
Morphan1 2015-03-10 03:40:25 -04:00
parent b20a0d4b4b
commit b0f7fb4348
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/citizensnpcs/EventListen.java
View File

@ -283,24 +283,27 @@ public class EventListen implements Listener {
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
Player player = event.getPlayer(); final Player player = event.getPlayer();
if (player == null || !player.isValid())
return;
for (Entity entity : player.getNearbyEntities(72, 72, 72)) { for (Entity entity : player.getNearbyEntities(72, 72, 72)) {
if (entity instanceof Player && npcRegistry.isNPC(entity)) { if (entity instanceof Player && npcRegistry.isNPC(entity)) {
final EntityPlayer entityplayer = ((CraftPlayer) player).getHandle();
final EntityPlayer entitynpc = ((CraftPlayer) entity).getHandle(); final EntityPlayer entitynpc = ((CraftPlayer) entity).getHandle();
entityplayer.playerConnection.sendPacket(new PacketPlayOutPlayerInfo( NMS.sendPacket(player, new PacketPlayOutPlayerInfo(
PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entitynpc)); PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entitynpc));
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
entityplayer.playerConnection.sendPacket(new PacketPlayOutPlayerInfo( if (!player.isValid())
return;
NMS.sendPacket(player, new PacketPlayOutPlayerInfo(
PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entitynpc)); PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entitynpc));
} }
}.runTaskLater(CitizensAPI.getPlugin(), 2); }.runTaskLater(CitizensAPI.getPlugin(), 2);
} }
} }
} }
}.runTaskLater(CitizensAPI.getPlugin(), 30); }.runTaskLater(CitizensAPI.getPlugin(), 40);
} }
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)