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 TPS Catchup
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a48c296d8e..cfccf2ca4d 100644
index 18721c9152..0f9c6b964f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1002,7 +1002,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1003,7 +1003,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.a(this::canSleepForTick);
this.methodProfiler.exitEnter("nextTickWait");
this.X = true;