From 20f6705a20ca72bfe22528edd6531db0e37ed828 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Thu, 8 Jun 2023 16:47:58 -0700 Subject: [PATCH] Updated Upstream (CraftBukkit/Spigot) 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 CraftBukkit Changes: fd92f1e65 SPIGOT-7378: Add BlockDropItemEvent for Suspicious Sand & Gravel drops cb1b69d13 SPIGOT-7377: Server sends player list twice Spigot Changes: 16cfc987 Rebuild patches --- .../Use-single-player-info-update-packet-on-join.patch | 9 --------- work/CraftBukkit | 2 +- work/Spigot | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/patches/server/Use-single-player-info-update-packet-on-join.patch b/patches/server/Use-single-player-info-update-packet-on-join.patch index 69b255cd9f..6150695961 100644 --- a/patches/server/Use-single-player-info-update-packet-on-join.patch +++ b/patches/server/Use-single-player-info-update-packet-on-join.patch @@ -21,15 +21,6 @@ diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/ma index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -0,0 +0,0 @@ public abstract class PlayerList { - player.sendServerStatus(serverping); - } - -- player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); -+ // player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); // Paper - this.players.add(player); - this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot - this.playersByUUID.put(player.getUUID(), player); @@ -0,0 +0,0 @@ public abstract class PlayerList { // CraftBukkit start - sendAll above replaced with this loop ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player)); diff --git a/work/CraftBukkit b/work/CraftBukkit index f3b2b22103..fd92f1e654 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit f3b2b2210362d2f322fe1999e96453bc4abb98a4 +Subproject commit fd92f1e65447be1d336ce0c43f2e915f01f2fc1d diff --git a/work/Spigot b/work/Spigot index 723951c3cf..16cfc98727 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 723951c3cf8cf3bb6721b3da29cd262f642fbfb1 +Subproject commit 16cfc987271eddcc0ffeb5d8cc968ea16c19e986