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
This commit is contained in:
Spottedleaf 2023-06-08 16:47:58 -07:00
parent 5c8d49542f
commit 20f6705a20
3 changed files with 2 additions and 11 deletions

View file

@ -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));

@ -1 +1 @@
Subproject commit f3b2b2210362d2f322fe1999e96453bc4abb98a4
Subproject commit fd92f1e65447be1d336ce0c43f2e915f01f2fc1d

@ -1 +1 @@
Subproject commit 723951c3cf8cf3bb6721b3da29cd262f642fbfb1
Subproject commit 16cfc987271eddcc0ffeb5d8cc968ea16c19e986