From 4d004d5fed51e6fb8ef9ce6f970d73186371078a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 25 Nov 2016 10:42:30 +1100
Subject: [PATCH] Throw exception when ServerConnectEvent is handled badly

---
 proxy/src/main/java/net/md_5/bungee/UserConnection.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index d620fbf5..3ac6396f 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -217,7 +217,7 @@ public final class UserConnection implements ProxiedPlayer
     public void connectNow(ServerInfo target)
     {
         dimensionChange = true;
-        connect(target);
+        connect( target );
     }
 
     public ServerInfo updateAndGetNextServer(ServerInfo currentTarget)
@@ -252,6 +252,11 @@ public final class UserConnection implements ProxiedPlayer
             {
                 callback.done( false, null );
             }
+
+            if ( getServer() == null && !ch.isClosing() )
+            {
+                throw new IllegalStateException("Cancelled ServerConnectEvent with no server or disconnect.");
+            }
             return;
         }