Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2f1c6f35 do not teleport player twice on first spawn
PaperMC/Paper@889d78a3 Add registry builders for SoundEvent and JukeboxSong (#11805)
PaperMC/Paper@6fddc93a keep original generics on now-deprecated freeze
PaperMC/Paper@a5f209c6 Disable oldPaper base
This commit is contained in:
granny
2025-06-15 00:19:25 -07:00
parent 86c25932ab
commit db7b854fab
4 changed files with 18 additions and 23 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
@@ -406,7 +_,7 @@
@@ -401,7 +_,7 @@
scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
}
// Paper end - Configurable player collision
@@ -9,7 +9,7 @@
// Paper start - Send empty chunk, so players aren't stuck in the world loading screen with our chunk system not sending chunks when dead
if (player.isDeadOrDying()) {
net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome> plains = serverLevel.registryAccess().lookupOrThrow(net.minecraft.core.registries.Registries.BIOME)
@@ -513,6 +_,7 @@
@@ -508,6 +_,7 @@
}
public @Nullable net.kyori.adventure.text.Component remove(ServerPlayer player, net.kyori.adventure.text.Component leaveMessage) {
// Paper end - Fix kick event leave message not being sent
@@ -17,7 +17,7 @@
ServerLevel serverLevel = player.level();
player.awardStat(Stats.LEAVE_GAME);
// CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it
@@ -671,7 +_,7 @@
@@ -666,7 +_,7 @@
// return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameProfile)
// ? Component.translatable("multiplayer.disconnect.server_full")
// : null;
@@ -26,7 +26,7 @@
event.disallow(org.bukkit.event.player.PlayerLoginEvent.Result.KICK_FULL, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.serverFullMessage)); // Spigot // Paper - Adventure
}
}
@@ -933,6 +_,20 @@
@@ -928,6 +_,20 @@
}
}
@@ -47,7 +47,7 @@
public void broadcastAll(Packet<?> packet, ResourceKey<Level> dimension) {
for (ServerPlayer serverPlayer : this.players) {
if (serverPlayer.level().dimension() == dimension) {
@@ -1017,6 +_,7 @@
@@ -1012,6 +_,7 @@
} else {
b = (byte)(24 + permLevel);
}