Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ed44f69 Fix NamespacedKey#equals not accepting other Key types (#8919)
PaperMC/Paper@e2b8e6b chore: update adventure documentation url in javadocs (#8912)
PaperMC/Paper@2f953a8 Additional ExplosiveMinecart API (#8896)
PaperMC/Paper@fc072c0 Fix forced respawn with respawn anchor (#8845)
PaperMC/Paper@16fc1a1 Make PluginProviderContext#getLogger return ComponentLogger, remove PluginProviderContext#getSLF4JLogger (#8921)
PaperMC/Paper@9256248 [ci skip] Update README and CONTRIBUTING (#8917)
PaperMC/Paper@ad3e1bc Don't log or die on cyclic dependencies of Spigot plugins
This commit is contained in:
granny
2023-02-27 03:32:11 -08:00
parent 387a581a42
commit afcd5b6f10
6 changed files with 14 additions and 14 deletions

View File

@@ -676,10 +676,10 @@ index 3f547b68a304d47249162154e11ebe6528f5ecea..d468bb5e61ba25cfb2b462e2d0852256
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 03a1e1a9af8ed6ac922748a685a180defcb85997..c34c5368e336ba4b181a95932a9b40cb4f50ae1d 100644
index 891ff89715aef3c020e5869ebe500aa3c2fd88e6..82093c413722e280b9fcb46fb0ba03ca629e54fa 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1226,7 +1226,7 @@ public abstract class PlayerList {
@@ -1228,7 +1228,7 @@ public abstract class PlayerList {
public void saveAll(int interval) {
io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -688,7 +688,7 @@ index 03a1e1a9af8ed6ac922748a685a180defcb85997..c34c5368e336ba4b181a95932a9b40cb
int numSaved = 0;
long now = MinecraftServer.currentTick;
for (int i = 0; i < this.players.size(); ++i) {
@@ -1237,7 +1237,7 @@ public abstract class PlayerList {
@@ -1239,7 +1239,7 @@ public abstract class PlayerList {
}
// Paper end
}