OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-25 00:07:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix build for last commit. 5am commits are great

Browse source
This commit is contained in:
Aikar 2020-04-23 04:53:20 -04:00
parent a6dbadb9d0
commit d0f606ec78
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Spigot-Server-Patches/Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
View file

@ -61,7 +61,7 @@ index 1ef7890da5..e62ca0543f 100644
@Override @Override
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7bfadb35d2..f68494b030 100644 index 7bfadb35d2..1086d1caac 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -128,7 +128,6 @@ index 7bfadb35d2..f68494b030 100644
+ // Paper start + // Paper start
+ if (throwable instanceof ThreadDeath) { + if (throwable instanceof ThreadDeath) {
+ MinecraftServer.LOGGER.error("Main thread terminated by WatchDog due to hard crash", throwable); + MinecraftServer.LOGGER.error("Main thread terminated by WatchDog due to hard crash", throwable);
+ isThreadDeath = true;
+ return; + return;
+ } + }
+ // Paper end + // Paper end