From 8522e7b274a5e2e0cb063cbfe4c80f3d8f4a06c2 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Wed, 1 Jul 2020 12:21:57 +0100
Subject: [PATCH] Fix shutdown on eula not being agreed (Fixes #4647)

---
 ...12-Improve-Server-Thread-Pool-and-Thread-Priorities.patch | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Spigot-Server-Patches/0312-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/Spigot-Server-Patches/0312-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 692ecd8627..7e86a5ff23 100644
--- a/Spigot-Server-Patches/0312-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/Spigot-Server-Patches/0312-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -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
 new file mode 100644
-index 0000000000000000000000000000000000000000..1a94648cb79c8f2889aacb5fb21dc07ad84a4a6b
+index 0000000000000000000000000000000000000000..703f45da2954272a7b92e2b11087c80a11f0370d
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ServerWorkerThread.java
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,26 @@
 +package net.minecraft.server;
 +
 +import java.util.concurrent.CompletionException;
@@ -39,6 +39,7 @@ index 0000000000000000000000000000000000000000..1a94648cb79c8f2889aacb5fb21dc07a
 +    public ServerWorkerThread(Runnable target) {
 +        super(target, "Server-Worker-" + threadId.getAndIncrement());
 +        setPriority(Thread.NORM_PRIORITY-1); // Deprioritize over main
++        this.setDaemon(true);
 +        this.setUncaughtExceptionHandler((thread, throwable) -> {
 +            thread.setDaemon(true);
 +            if (throwable instanceof CompletionException) {