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

@@ -77,10 +77,10 @@ index 16a20f2683..a18dadee56 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6b54a235f3..5bfe1d36b6 100644
index fd75444cec..95d93cd8e5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -2314,6 +2314,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -2315,6 +2315,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
return methodprofilerresults;
}