From 6682552eb25665ef8f206a6674dd4ab8a6b81493 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Fri, 3 Dec 2021 17:33:56 -0800 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (#7009) --- patches/server/Entity-AddTo-RemoveFrom-World-Events.patch | 4 ++-- patches/server/Player.setPlayerProfile-API.patch | 4 ++-- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/server/Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/Entity-AddTo-RemoveFrom-World-Events.patch index 8668e73224..ae68640e33 100644 --- a/patches/server/Entity-AddTo-RemoveFrom-World-Events.patch +++ b/patches/server/Entity-AddTo-RemoveFrom-World-Events.patch @@ -17,9 +17,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public void onTrackingEnd(Entity entity) { @@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { + } } - - entity.valid = false; // CraftBukkit + // CraftBukkit end + new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid } } diff --git a/patches/server/Player.setPlayerProfile-API.patch b/patches/server/Player.setPlayerProfile-API.patch index ad2c45f5f4..867390c76f 100644 --- a/patches/server/Player.setPlayerProfile-API.patch +++ b/patches/server/Player.setPlayerProfile-API.patch @@ -116,5 +116,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // Paper end - public void removeDisconnectingPlayer(Player player) { - this.hiddenEntities.remove(player.getUniqueId()); + public void onEntityRemove(Entity entity) { + this.hiddenEntities.remove(entity.getUUID()); diff --git a/work/Bukkit b/work/Bukkit index 9115281ff1..1c9ca40548 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 9115281ff1762658109d43c1bd4fca8b7814d7f2 +Subproject commit 1c9ca4054853af6e4210a63cb71fc537d4d4af95 diff --git a/work/CraftBukkit b/work/CraftBukkit index fd3478bc77..1825cc0b04 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit fd3478bc77e3b1280e1e02dba6822490a51f011d +Subproject commit 1825cc0b04ff9e14df7a511aec855ad80a896d19