MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fire ProxyShutdownEvent before closing the scheduler / event bus

Browse Source 
Fixes #322
This commit is contained in:
Luck
2020-06-29 15:48:28 +01:00
committed by Andrew Steinborn
parent 7fd76962f2
commit ea52cedfdf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
View File

@@ -403,6 +403,8 @@ public class VelocityServer implements ProxyServer {
timedOut = true; timedOut = true;
} }
eventManager.fireShutdownEvent();
timedOut = !eventManager.shutdown() || timedOut; timedOut = !eventManager.shutdown() || timedOut;
timedOut = !scheduler.shutdown() || timedOut; timedOut = !scheduler.shutdown() || timedOut;
@@ -414,8 +416,6 @@ public class VelocityServer implements ProxyServer {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
eventManager.fireShutdownEvent();
shutdown = true; shutdown = true;
if (explicitExit) { if (explicitExit) {