Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-10-04 01:17:56 +02:00
Code Issues Projects Releases Wiki Activity

Fix server not stopping when eula not agreed yet

Browse Source
This commit is contained in:
Aikar 2020-07-01 03:32:26 -04:00
parent 6f30ecdeb9
commit 4fd0d54ee7
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Spigot-Server-Patches/0312-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
View File

@ -25,10 +25,10 @@ index b13d8ec9aa0a51d5432129f1b0ecef3beb5b7276..f4c93a65c28eeca4a07aaf9b00507d5c
} }
diff --git a/src/main/java/net/minecraft/server/ServerWorkerThread.java b/src/main/java/net/minecraft/server/ServerWorkerThread.java diff --git a/src/main/java/net/minecraft/server/ServerWorkerThread.java b/src/main/java/net/minecraft/server/ServerWorkerThread.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..59cfb76d737f923c7e424743ef370c969ae14c26 index 0000000000000000000000000000000000000000..1a94648cb79c8f2889aacb5fb21dc07ad84a4a6b
--- /dev/null --- /dev/null
+++ b/src/main/java/net/minecraft/server/ServerWorkerThread.java +++ b/src/main/java/net/minecraft/server/ServerWorkerThread.java
@@ -0,0 +1,24 @@ @@ -0,0 +1,25 @@
+package net.minecraft.server; +package net.minecraft.server;
+ +
+import java.util.concurrent.CompletionException; +import java.util.concurrent.CompletionException;
@ -40,6 +40,7 @@ index 0000000000000000000000000000000000000000..59cfb76d737f923c7e424743ef370c96
+ super(target, "Server-Worker-" + threadId.getAndIncrement()); + super(target, "Server-Worker-" + threadId.getAndIncrement());
+ setPriority(Thread.NORM_PRIORITY-1); // Deprioritize over main + setPriority(Thread.NORM_PRIORITY-1); // Deprioritize over main
+ this.setUncaughtExceptionHandler((thread, throwable) -> { + this.setUncaughtExceptionHandler((thread, throwable) -> {
+ thread.setDaemon(true);
+ if (throwable instanceof CompletionException) { + if (throwable instanceof CompletionException) {
+ throwable = throwable.getCause(); + throwable = throwable.getCause();
+ } + }