Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@aabf676 Prevent unloading worlds with pending player logins
This commit is contained in:
BillyGalbreath
2022-08-28 14:45:03 -05:00
parent 1c88954c70
commit 7005356a4d
21 changed files with 83 additions and 83 deletions

View File

@@ -83,10 +83,10 @@ index 725358518b73b908c8150bdbabed68909c91f4d4..b858ce2ad443f6690dd71e56fb9eea14
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 0056694109587822601620df5062d933325ec2ae..37255fb6bff06d2aabf2acd2d435269b1a9dbb15 100644
index 22fde2975bc5d66bd60ce0325945ee7c5afac55e..d1acb410384899866458fbb8b63284a0148c92f2 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -497,6 +497,7 @@ public abstract class PlayerList {
@@ -499,6 +499,7 @@ public abstract class PlayerList {
scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
}
// Paper end
@@ -94,7 +94,7 @@ index 0056694109587822601620df5062d933325ec2ae..37255fb6bff06d2aabf2acd2d435269b
// CraftBukkit - Moved from above, added world
PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
}
@@ -607,6 +608,8 @@ public abstract class PlayerList {
@@ -609,6 +610,8 @@ public abstract class PlayerList {
}
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
// Paper end