Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-15 23:06:01 +01:00
Code Issues Projects Releases Wiki Activity

Avoid stopping if already in progress

Browse Source 
Currently it is possible to stop the proxy multiple times, causing
the shutdown routines to be called twice. This doesn't make any
sense and may even cause problems with some plugins.

Cancel early if stopping is already in progress to avoid this.
This commit is contained in:
Minecrell 2018-07-06 23:18:54 +02:00 committed by Jamie Mansfield
parent 6ae43560bc
commit 3d3ab27dcf
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
BungeeCord-Patches/0048-Avoid-stopping-if-already-in-progress.patch Normal file
View File

@ -0,0 +1,26 @@
From 26db2fb70aef93e407e58be44bca22e691ba44d1 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 6 Jul 2018 23:15:21 +0200
Subject: [PATCH] Avoid stopping if already in progress
Currently it is possible to stop the proxy multiple times, causing
the shutdown routines to be called twice. This doesn't make any
sense and may even cause problems with some plugins.
Cancel early if stopping is already in progress to avoid this.
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index d5b3bd3d..ae7297f5 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -386,6 +386,7 @@ public class BungeeCord extends ProxyServer
@Override
public void stop(final String reason)
{
+ if (!this.isRunning) return; // Waterfall - Avoid stopping if already in progress
new Thread( "Shutdown Thread" )
{
@Override
--
2.18.0