From ea52cedfdfdb9ca05213e85a6a217764c46dc5ab Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Mon, 29 Jun 2020 15:48:28 +0100
Subject: [PATCH] Fire ProxyShutdownEvent before closing the scheduler / event
 bus

Fixes #322
---
 .../main/java/com/velocitypowered/proxy/VelocityServer.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java b/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
index e011085a5..88b2e8971 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
@@ -403,6 +403,8 @@ public class VelocityServer implements ProxyServer {
           timedOut = true;
         }
 
+        eventManager.fireShutdownEvent();
+
         timedOut = !eventManager.shutdown() || timedOut;
         timedOut = !scheduler.shutdown() || timedOut;
 
@@ -414,8 +416,6 @@ public class VelocityServer implements ProxyServer {
         Thread.currentThread().interrupt();
       }
 
-      eventManager.fireShutdownEvent();
-
       shutdown = true;
 
       if (explicitExit) {