From f3497a0c5c2736a0785ee7329127835b8b36a6b1 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 1 Feb 2022 11:35:36 +0000 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 5c21a63f PR-717: Add PlayerHideEntityEvent and PlayerShowEntityEvent CraftBukkit Changes: c26a7b54d PR-1000: Add PlayerHideEntityEvent and PlayerShowEntityEvent --- patches/server/Player.setPlayerProfile-API.patch | 4 ++-- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/server/Player.setPlayerProfile-API.patch b/patches/server/Player.setPlayerProfile-API.patch index 867390c76f..be92f2904a 100644 --- a/patches/server/Player.setPlayerProfile-API.patch +++ b/patches/server/Player.setPlayerProfile-API.patch @@ -68,8 +68,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (other instanceof ServerPlayer) { ServerPlayer otherPlayer = (ServerPlayer) other; @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - entry.updatePlayer(this.getHandle()); - } + + server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity)); } + // Paper start + private void reregisterPlayer(ServerPlayer player) { diff --git a/work/Bukkit b/work/Bukkit index d356515a16..5c21a63f5f 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit d356515a16c91cccd6c5c69dbbbadb813aa31d62 +Subproject commit 5c21a63f5f835b4e1d8ea8cb49d6217dc606a603 diff --git a/work/CraftBukkit b/work/CraftBukkit index 507e2f6512..c26a7b54dc 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 507e2f65120541b1bc9199a0e0ba957d1559b7d6 +Subproject commit c26a7b54dc3973edd00e88f83b37a566b0027053