3
0
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-11-17 05:20:14 +01:00

Merge pull request #323 from lucko/fix/shutdown-event-order

Fire ProxyShutdownEvent before closing the scheduler / event bus
Dieser Commit ist enthalten in:
Andrew Steinborn 2020-06-29 11:18:09 -04:00 committet von GitHub
Commit 5bea13c74e
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23

Datei anzeigen

@ -409,6 +409,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;
@ -420,8 +422,6 @@ public class VelocityServer implements ProxyServer {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
eventManager.fireShutdownEvent();
shutdown = true; shutdown = true;
if (explicitExit) { if (explicitExit) {