Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d1a72ea Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11405)
PaperMC/Paper@0a53f1d Set default drop behavior for player deaths (#11380)
PaperMC/Paper@951e7dd Fix TrialSpawner forgetting assigned mob when placed by player (#11381)
PaperMC/Paper@13a2395 Fix enable-player-collisions playing sounds when set to false (#11390)
This commit is contained in:
granny
2024-09-15 20:18:23 -07:00
parent bc7bcbb8dd
commit 8af4ea6f46
30 changed files with 103 additions and 103 deletions

View File

@@ -510,10 +510,10 @@ index c65dc84615e5b434c15c26fb712a7e6336eeeb32..c3699c7dcc2c94215d6601c7c07669c3
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 53172745c5e68a22f651710860075bdc41debc8f..e4978abcc79ee51fa95442b82d9079c8ee1e60d6 100644
index f0198fbdc39732075b647e6ca99a6ded99d37efc..6f4e471c45195996a1cdd93c7dfb64e68156212f 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1232,7 +1232,7 @@ public abstract class PlayerList {
@@ -1237,7 +1237,7 @@ public abstract class PlayerList {
public void saveAll(int interval) {
io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -522,7 +522,7 @@ index 53172745c5e68a22f651710860075bdc41debc8f..e4978abcc79ee51fa95442b82d9079c8
int numSaved = 0;
long now = MinecraftServer.currentTick;
for (int i = 0; i < this.players.size(); ++i) {
@@ -1243,7 +1243,7 @@ public abstract class PlayerList {
@@ -1248,7 +1248,7 @@ public abstract class PlayerList {
}
// Paper end - Incremental chunk and player saving
}