Ensure synchronous shutdown if the user kills the process.

2020-10-02 00:23:01 -04:00
parent 65cab85b50
commit cb74210cd8
1 changed files with 6 additions and 2 deletions
--- a/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
@@ -456,8 +456,12 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
      }
    };

-    Thread thread = new Thread(shutdownProcess);
-    thread.start();
+    if (explicitExit) {
+      Thread thread = new Thread(shutdownProcess);
+      thread.start();
+    } else {
+      shutdownProcess.run();
+    }
  }

  /**