Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@46a9d2a Cache Component MOTDs
This commit is contained in:
BillyGalbreath
2022-07-22 22:01:21 -05:00
parent a60a01188e
commit e65c695fc5
13 changed files with 75 additions and 73 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d4b05231b6b631f382d7e5fe6c42eba3e1581fad..400a9580db10aa647eb6c0a68d521b4bd998ba4b 100644
index ef66e1134099b5d328858bb7e25488529e12690d..bf68f5632c374fe725f00de119f09fb703cf61fb 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1657,7 +1657,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1658,7 +1658,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -18,7 +18,7 @@ index d4b05231b6b631f382d7e5fe6c42eba3e1581fad..400a9580db10aa647eb6c0a68d521b4b
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index ef8f2dd75b04534c454205cadf2bb5b0fbc5764b..c08f8b8a140fd2d746b054ef7ff2a689a0cca6c2 100644
index cf7925c5631815a53926543b79179c58e923402e..290c1ac6e1e7bd485a6c63492d4f72b55af7b46b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -181,6 +181,11 @@ public class PurpurConfig {