Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@bf5852a Fix NPE for PlayerPostRespawnEvent#getRespawnedLocation (#11268)
PaperMC/Paper@fb53074 Apply optimise collision checking in move packet handling patch
PaperMC/Paper@81bfda8 [ci skip] Specify rebase location in CONTRIBUTING (#11255)
PaperMC/Paper@9571983 Fix scanForLegacyEnderDragon world config (#11262)
PaperMC/Paper@ec55c11 Fix indestructable light blocks (#11275)
PaperMC/Paper@1b8ab11 Add Configuration for vertical Despawn Ranges (#10440)
PaperMC/Paper@534ab86 [ci-skip] Revert "Add Configuration for vertical Despawn Ranges (#10440)" (#11278)
PaperMC/Paper@e619744 Allow skipping of world symlink validation (#11250)
PaperMC/Paper@78216fe Re-implement portalCreateRadius world config (#11267)
PaperMC/Paper@4829fbf Handle custom registry elements properly (#11230)
This commit is contained in:
granny
2024-08-16 15:58:02 -07:00
parent 201e928fa6
commit f2307b8f17
17 changed files with 48 additions and 48 deletions

View File

@@ -510,10 +510,10 @@ index 514620a64495023fa917c14c971cd112fd64b33a..7ece40ea9ad3ba74b93250f72b42fc62
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 15b71ef1f52467eec0020fb837f78d9f2cfd8556..1b1008ffd544dcddc31238e10c06df0d7aa68793 100644
index b1adc1291a03489722e3eea1b20233052b9aa0fd..1babe6756b904fd2e5b2d62f6adfa153e3b772f1 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1228,7 +1228,7 @@ public abstract class PlayerList {
@@ -1231,7 +1231,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 15b71ef1f52467eec0020fb837f78d9f2cfd8556..1b1008ffd544dcddc31238e10c06df0d
int numSaved = 0;
long now = MinecraftServer.currentTick;
for (int i = 0; i < this.players.size(); ++i) {
@@ -1239,7 +1239,7 @@ public abstract class PlayerList {
@@ -1242,7 +1242,7 @@ public abstract class PlayerList {
}
// Paper end - Incremental chunk and player saving
}