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

@@ -17,10 +17,10 @@ index c6a97b3fa04c683a92a8d838f98e73b59bb7558a..2fbb65c685ac88c77d54f27a5981a132
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6c593bf7c0ab8f70470705c4210ade11714c4bcc..db39fd89be32f2f3d4d38b8e633f50a40bdd0235 100644
index 5b5d3bf526505cb035d968b9e89b40ada5077788..c600bd033cc88d01f2202cedd5f14e918997072f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -278,6 +278,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -279,6 +279,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
//public ConsoleReader reader; // Paper
public static int currentTick = 0; // Paper - Further improve tick loop
@@ -29,7 +29,7 @@ index 6c593bf7c0ab8f70470705c4210ade11714c4bcc..db39fd89be32f2f3d4d38b8e633f50a4
public int autosavePeriod;
public Commands vanillaCommandDispatcher;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 8b1299a15c886585904271d50925283e505ee4e4..12c8cd424668c2167c071b48d0c1f689ca363513 100644
index 61d3055e0cd541c3e0197daed15c831ee7dbb7ff..ec1e02ece9e15860fbf1321d932829a4a4dd8e1a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -178,6 +178,7 @@ public class PurpurConfig {