Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
cffe4c07 Scheduling an async task timer creates a non-repeating task (#3543)
e224f0bd Fix issues with SIGTERM not shutting down gracefully - Fixes #3062
c7112d06 Ensure chunk gen tasks return to main thread before completing futures
This commit is contained in:
William Blake Galbreath
2020-06-11 21:15:42 -05:00
parent 904c72028c
commit dc980f0950
11 changed files with 40 additions and 40 deletions

View File

@@ -1,4 +1,4 @@
From aaf81940ff06eed3ca9f1470d22e44737f8d4a80 Mon Sep 17 00:00:00 2001
From b873e07765d3a575cc2473859ea76d6d87c0173b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 21 Mar 2020 11:47:39 -0500
Subject: [PATCH] Configurable server mod name
@@ -9,10 +9,10 @@ Subject: [PATCH] Configurable server mod name
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 57acbbce17..c4f784f3d7 100644
index a888465187..9052d4475d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1587,7 +1587,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1588,7 +1588,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {