Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
0081e8ef8 Fix plugin provides not being listed behind name in /plugins (#4825)
9119af508 Fix keep-spawn-loaded stopping force-loaded chunks from loading
This commit is contained in:
BillyGalbreath
2020-12-01 12:58:07 -06:00
parent 18eb6f7ad7
commit cac648ada6
11 changed files with 44 additions and 44 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 b6aa6454e2..74b8db0302 100644
index 41fec4a981..6dd5684cc2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1514,7 +1514,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1509,7 +1509,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {
@@ -18,7 +18,7 @@ index b6aa6454e2..74b8db0302 100644
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d699a91685..27cbfdfba8 100644
index c7a90492e1..649b8c517e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -139,6 +139,11 @@ public class PurpurConfig {