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:
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
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0088-UPnP-Port-Forwarding-Service.patch
View File

@@ -1,4 +1,4 @@
From 0932808f41571426fa90c5d6336e6a0451e113fe Mon Sep 17 00:00:00 2001
From dce1cff61c4daa9eaffa8510209cd74a5256f378 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 22 Jan 2020 20:13:40 -0600
Subject: [PATCH] UPnP Port Forwarding Service
@@ -42,7 +42,7 @@ index d5709e670b..43d6bed366 100644
<pluginRepositories>
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 73d2b32c5c..a522ed5c36 100644
index b29f5dc8c2..63b5bbc0e8 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -241,6 +241,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -78,7 +78,7 @@ index 73d2b32c5c..a522ed5c36 100644
// this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up
server.loadPlugins();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index fd9e8db0b6..57acbbce17 100644
index 81422ab15a..a888465187 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -187,6 +187,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -89,7 +89,7 @@ index fd9e8db0b6..57acbbce17 100644
public MinecraftServer(OptionSet options, Proxy proxy, DataFixer datafixer, CommandDispatcher commanddispatcher, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory, String s) {
super("Server");
@@ -744,6 +745,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -745,6 +746,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
// CraftBukkit end
MinecraftServer.LOGGER.info("Stopping server (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PAPER)"); // Paper
MinecraftTimings.stopServer(); // Paper