Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
684b6ea40 fixed bug in jvm checker (#4845)
f15abda56 Enable Multi-Release plugin jar support
This commit is contained in:
BillyGalbreath
2020-12-04 22:18:30 -06:00
parent 740b7d214f
commit 6e42ce8f1c
11 changed files with 38 additions and 37 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 53a52e5195..46615553ff 100644
index 7f834ba4cc..c7cd40ecb6 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1511,7 +1511,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1512,7 +1512,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {