fix Bungee shutdown errors

DenizenScript · Aug 19, 2019 · 0055968 · 0055968
1 parent 0224e49
commit 0055968
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/Depenizen.java b/src/main/java/com/denizenscript/depenizen/bukkit/Depenizen.java
@@ -47,6 +47,13 @@ public void onEnable() {
         Debug.log("Depenizen loaded! " + loadedBridges.size() + " plugin bridge(s) loaded (of " + allBridges.size() + " available)");
     }
 
+    @Override
+    public void onDisable() {
+        if (BungeeBridge.instance.connected) {
+            BungeeBridge.instance.onShutdown();
+        }
+    }
+
     public void checkLoadBungeeBridge() {
         String bungeeServer = getConfig().getString("Bungee server address", "none");
         if (CoreUtilities.toLowerCase(bungeeServer).equals("none")) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bungee/BungeeBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bungee/BungeeBridge.java
@@ -123,7 +123,7 @@ public void init(String address, int port) {
     public boolean reconnectPending = false;
 
     public void reconnect() {
-        if (reconnectPending) {
+        if (reconnectPending || shuttingDown) {
             return;
         }
         Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, new Runnable() {
@@ -135,6 +135,21 @@ public void run() {
         }, 20 * 5);
     }
 
+    public boolean shuttingDown = false;
+
+    public void onShutdown() {
+        shuttingDown = true;
+        if (connected) {
+            try {
+                handler.channel.close().await();
+                connected = false;
+            }
+            catch (Throwable ex) {
+                Debug.echoError(ex);
+            }
+        }
+    }
+
     private boolean showedLastError = false;
 
     private boolean hasConnectionLoading = false;