From d51d7f1d86a83f35b2f6206ea3328287b0ed640c Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sun, 28 Aug 2016 03:56:17 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=9F=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD=20?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=BD?=
 =?UTF-8?q?=D0=BE=20=D0=B2=D1=8B=D0=B3=D1=80=D1=83=D0=B6=D0=B0=D0=BB=D1=81?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bridge/pom.xml                                     | 2 +-
 Bridge/src/main/java/asys/bridge/Bridge.java       | 8 ++++++--
 Bridge/src/main/java/asys/bridge/netty/Client.java | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Bridge/pom.xml b/Bridge/pom.xml
index 696448e..74c1a1c 100644
--- a/Bridge/pom.xml
+++ b/Bridge/pom.xml
@@ -16,7 +16,7 @@
 
     <groupId>asys</groupId>
     <artifactId>bridge</artifactId>
-    <version>0.12</version>
+    <version>0.13</version>
     <packaging>jar</packaging>
 
     <repositories>
diff --git a/Bridge/src/main/java/asys/bridge/Bridge.java b/Bridge/src/main/java/asys/bridge/Bridge.java
index ce21f5e..8a6cef9 100644
--- a/Bridge/src/main/java/asys/bridge/Bridge.java
+++ b/Bridge/src/main/java/asys/bridge/Bridge.java
@@ -13,6 +13,7 @@ import java.net.ConnectException;
 public class Bridge extends Plugin {
     private Client netty;
     private BungeeServerAPI serverAPI;
+    private Thread  nettyClientThread;
 
     @Override
     public void onEnable() {
@@ -23,13 +24,16 @@ public class Bridge extends Plugin {
             return;
         }
 
-        new Thread(new WatchConnect(), "ASys Client").start();
+        nettyClientThread = new Thread(new WatchConnect(), "ASys Client");
+        nettyClientThread.start();
     }
 
     @Override
     public void onDisable() {
-        if (netty != null)
+        if (netty != null && netty.isConnected()) {
             netty.disconnect();
+        }
+        nettyClientThread.interrupt();
     }
 
     public BungeeServerAPI getServerAPI() {
diff --git a/Bridge/src/main/java/asys/bridge/netty/Client.java b/Bridge/src/main/java/asys/bridge/netty/Client.java
index 39763fc..31d3cae 100644
--- a/Bridge/src/main/java/asys/bridge/netty/Client.java
+++ b/Bridge/src/main/java/asys/bridge/netty/Client.java
@@ -67,6 +67,6 @@ public class Client {
     }
 
     public boolean isConnected() {
-        return channel.isOpen();
+        return channel != null && channel.isOpen();
     }
 }