Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@bd62f2c Fix chat messages being logged without formatting to console (#9058)
PaperMC/Paper@ce2a36d Fix PluginMeta#getDisplayName (#9038)
PaperMC/Paper@9940019 Deprecate public Timings classes for removal (#8949)
PaperMC/Paper@5c78e77 Fix api checking banned ips (#9026)
This commit is contained in:
granny
2023-03-27 21:33:51 -07:00
parent 7e014a84b5
commit f5a789d40b
19 changed files with 87 additions and 87 deletions

View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Cache server motd
Paper ported my patch in an odd way. Keeping my patch around to reduce logic on the motd getter
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index acf012ac619cf2f71449c1f495cf9c8485f9d0e5..41e19d9da784ec7360b2c1b271067721c70d6b41 100644
index 36b4ae46e0175b31db55b5a4192fee9746a711a3..64b4397a3d91d9c5a29498e738c317f362106fec 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -249,7 +249,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -250,7 +250,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
private boolean allowFlight;
@Nullable
private String motd;
@@ -18,7 +18,7 @@ index acf012ac619cf2f71449c1f495cf9c8485f9d0e5..41e19d9da784ec7360b2c1b271067721
private int playerIdleTimeout;
public final long[] tickTimes;
// Paper start
@@ -1902,17 +1902,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1903,17 +1903,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public net.kyori.adventure.text.Component getComponentMotd() {