Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +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

16
patches/server/0043-Make-the-GUI-better.patch
View File

@@ -1,4 +1,4 @@
From 93bef04f9845d383a377947d578dd0a30a71ab31 Mon Sep 17 00:00:00 2001
From a6b04c3367e30b636a384c0d9eed2e549d01b3b1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 16 Jan 2020 14:59:16 -0600
Subject: [PATCH] Make the GUI better
@@ -40,7 +40,7 @@ Subject: [PATCH] Make the GUI better
create mode 100644 src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index cf5abd393e..73d2b32c5c 100644
index 64adf186d9..b29f5dc8c2 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -8,6 +8,8 @@ import com.mojang.authlib.GameProfileRepository;
@@ -78,7 +78,7 @@ index cf5abd393e..73d2b32c5c 100644
}
if (this.remoteControlListener != null) {
@@ -519,7 +522,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -520,7 +523,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
public void bc() {
if (this.p == null) {
@@ -88,10 +88,10 @@ index cf5abd393e..73d2b32c5c 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 88333e3aeb..1d22c2044d 100644
index 1da54dba9f..447e9ea4ec 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1374,6 +1374,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1375,6 +1375,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
return true;
}
@@ -1177,13 +1177,13 @@ index 0000000000..4b340b88a2
+
+}
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 476f4a5cbe..522048dc9e 100644
index 8af159abd3..5bc278a995 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -1,8 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" packages="com.mojang.util">
+<Configuration status="WARN" packages="com.mojang.util,net.pl3x.purpur.util"><!-- Purpur -->
-<Configuration status="WARN" packages="com.mojang.util" shutdownHook="disable">
+<Configuration status="WARN" packages="com.mojang.util,net.pl3x.purpur.util" shutdownHook="disable"><!-- Purpur -->
<Appenders>
<Queue name="ServerGuiConsole">
- <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />