diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-01 00:02:43 +0200 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-01 00:02:43 +0200 |
| commit | 1af2540f784a8610a6ee743cf944eca5933a12c9 (patch) | |
| tree | 61158f27daa402f1ecf7e8cf17c581bf6399d04a | |
| parent | cd65011eacafd4e23cff20b62b029321f3cefcaa (diff) | |
| parent | cc9b479fe6379aa95d4da05e96131c77df3e650d (diff) | |
| download | craftbukkit-1af2540f784a8610a6ee743cf944eca5933a12c9.tar craftbukkit-1af2540f784a8610a6ee743cf944eca5933a12c9.tar.gz craftbukkit-1af2540f784a8610a6ee743cf944eca5933a12c9.tar.lz craftbukkit-1af2540f784a8610a6ee743cf944eca5933a12c9.tar.xz craftbukkit-1af2540f784a8610a6ee743cf944eca5933a12c9.zip | |
Merge pull request #16 in SPIGOT/craftbukkit from ~AET2505/craftbukkit:fix/ShowPlayer to master
* commit 'cc9b479fe6379aa95d4da05e96131c77df3e650d':
Fix show player
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 0f0e160b..3b9bfecc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -899,12 +899,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { EntityTracker tracker = ((WorldServer) entity.world).tracker; EntityPlayer other = ((CraftPlayer) player).getHandle(); + + getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, other)); + EntityTrackerEntry entry = (EntityTrackerEntry) tracker.trackedEntities.get(other.getId()); if (entry != null && !entry.trackedPlayers.contains(getHandle())) { entry.updatePlayer(getHandle()); } - - getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, other)); } public void removeDisconnectingPlayer(Player player) { |