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
This commit is contained in:
Shane Freeder 2022-02-01 11:35:36 +00:00
parent 295a45f95d
commit f3497a0c5c
3 changed files with 4 additions and 4 deletions

View file

@ -68,8 +68,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
if (other instanceof ServerPlayer) { if (other instanceof ServerPlayer) {
ServerPlayer otherPlayer = (ServerPlayer) other; ServerPlayer otherPlayer = (ServerPlayer) other;
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
entry.updatePlayer(this.getHandle());
} server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity));
} }
+ // Paper start + // Paper start
+ private void reregisterPlayer(ServerPlayer player) { + private void reregisterPlayer(ServerPlayer player) {

@ -1 +1 @@
Subproject commit d356515a16c91cccd6c5c69dbbbadb813aa31d62 Subproject commit 5c21a63f5f835b4e1d8ea8cb49d6217dc606a603

@ -1 +1 @@
Subproject commit 507e2f65120541b1bc9199a0e0ba957d1559b7d6 Subproject commit c26a7b54dc3973edd00e88f83b37a566b0027053