Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
31a6e3f89 [Auto] Updated Upstream (CraftBukkit)
eb89fd5de Add warning for servers not running on Java 11
This commit is contained in:
BillyGalbreath
2020-12-03 15:08:39 -06:00
parent b138486d13
commit 72086f3ab1
11 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0062-Configurable-TPS-Catchup.patch
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 7c7010aa5d..2c432a3cf6 100644
index a48c296d8e..cfccf2ca4d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1000,7 +1000,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1002,7 +1002,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.a(this::canSleepForTick);
this.methodProfiler.exitEnter("nextTickWait");
this.X = true;
@@ -24,7 +24,7 @@ index 7c7010aa5d..2c432a3cf6 100644
this.methodProfiler.exit();
this.methodProfiler.b();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index fd2bf433a1..e83a9632a7 100644
index 62cb13d1fa..1c6265818b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -194,4 +194,9 @@ public class PurpurConfig {