From 056e5d5953306dfbb8a585b663ce4b1235de74dc Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 20 Mar 2018 17:27:00 +0100 Subject: [PATCH] Add missing registerPlayer in CraftPlayer.showPlayer0 (#1051) --- .../0277-Player.setPlayerProfile-API.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Spigot-Server-Patches/0277-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0277-Player.setPlayerProfile-API.patch index c72d44beb8..4f2bf1ff0a 100644 --- a/Spigot-Server-Patches/0277-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0277-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 8e31a909319ac13bcacf35a8cc6c89c05b69c246 Mon Sep 17 00:00:00 2001 +From e19049ea23be5301ab117ae996d6f1a13d9d8528 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:29:48 -0400 Subject: [PATCH] Player.setPlayerProfile API @@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API This can be useful for changing name or skins after a player has logged in. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 4b82e43a8..35fde8b23 100644 +index 4b82e43a..35fde8b2 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -59,7 +59,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -19,7 +19,7 @@ index 4b82e43a8..35fde8b23 100644 private final ItemCooldown bW; @Nullable diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 21631c588..f0e3c2cff 100644 +index 21631c58..87e31cf0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,6 +1,8 @@ @@ -47,13 +47,14 @@ index 21631c588..f0e3c2cff 100644 EntityTrackerEntry entry = tracker.trackedEntities.get(other.getId()); if (entry != null) { entry.clear(getHandle()); -@@ -1134,8 +1142,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1134,8 +1142,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } hiddenPlayers.remove(player.getUniqueId()); - EntityTracker tracker = ((WorldServer) entity.world).tracker; + // Paper start EntityPlayer other = ((CraftPlayer) player).getHandle(); ++ registerPlayer(other); + } + private void registerPlayer(EntityPlayer other) { + EntityTracker tracker = ((WorldServer) entity.world).tracker; @@ -61,7 +62,7 @@ index 21631c588..f0e3c2cff 100644 getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other)); -@@ -1144,6 +1156,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1144,6 +1157,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player { entry.updatePlayer(getHandle()); } } @@ -88,5 +89,5 @@ index 21631c588..f0e3c2cff 100644 public void removeDisconnectingPlayer(Player player) { hiddenPlayers.remove(player.getUniqueId()); -- -2.16.2 +2.16.1.windows.1