Merge pull request #16 in SPIGOT/craftbukkit from ~AET2505/craftbukkit:fix/ShowPlayer to master

* commit 'cc9b479fe6379aa95d4da05e96131c77df3e650d':
  Fix show player
This commit is contained in:
Thinkofdeath 2014-12-01 00:02:43 +02:00
commit 1af2540f78

View File

@ -899,12 +899,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
EntityTracker tracker = ((WorldServer) entity.world).tracker; EntityTracker tracker = ((WorldServer) entity.world).tracker;
EntityPlayer other = ((CraftPlayer) player).getHandle(); EntityPlayer other = ((CraftPlayer) player).getHandle();
getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, other));
EntityTrackerEntry entry = (EntityTrackerEntry) tracker.trackedEntities.get(other.getId()); EntityTrackerEntry entry = (EntityTrackerEntry) tracker.trackedEntities.get(other.getId());
if (entry != null && !entry.trackedPlayers.contains(getHandle())) { if (entry != null && !entry.trackedPlayers.contains(getHandle())) {
entry.updatePlayer(getHandle()); entry.updatePlayer(getHandle());
} }
getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, other));
} }
public void removeDisconnectingPlayer(Player player) { public void removeDisconnectingPlayer(Player player) {