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