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

@@ -5,7 +5,7 @@ Subject: [PATCH] Component related conveniences
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 94d87f6bd2c27b0d6cc4547e8bc6e87b95f1ad32..db23ce6f9253697592d80e44c192e9a97d06b83b 100644
index 266a26d73dd5aec427b64a638693decf70ea36cb..2049fa1008be5208d9bb168dd65483613a7296f1 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1704,6 +1704,26 @@ public class ServerPlayer extends Player {
@@ -36,10 +36,10 @@ index 94d87f6bd2c27b0d6cc4547e8bc6e87b95f1ad32..db23ce6f9253697592d80e44c192e9a9
public void displayClientMessage(Component message, boolean overlay) {
this.sendSystemMessage(message, overlay);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 37d8a797bb590c30bf42ab04128489a9390684d3..3ef2c88ddec0f7088d1d88d1d98286bed382e1c1 100644
index 8326775a4005b03468fba1ec556f951dc740c302..26400f0efc7e0f97d2010532d42d0caaff99e071 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1068,6 +1068,20 @@ public abstract class PlayerList {
@@ -1070,6 +1070,20 @@ public abstract class PlayerList {
}
// CraftBukkit end