Merge pull request #104 from SpigotMC/master

Throw exception when ServerConnectEvent is handled badly
HexagonMC · Nov 25, 2016 · 6bb65b3 · 6bb65b3
2 parents 5052efc + 4d004d5
commit 6bb65b3
Showing 1 changed file with 6 additions and 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
@@ -221,7 +221,7 @@ public void connect(ServerInfo target, Callback<Boolean> callback)
     public void connectNow(ServerInfo target)
     {
         dimensionChange = true;
-        connect(target);
+        connect( target );
     }
 
     public ServerInfo updateAndGetNextServer(ServerInfo currentTarget)
@@ -256,6 +256,11 @@ public void connect(ServerInfo info, final Callback<Boolean> callback, final boo
             {
                 callback.done( false, null );
             }
+
+            if ( getServer() == null && !ch.isClosing() )
+            {
+                throw new IllegalStateException("Cancelled ServerConnectEvent with no server or disconnect.");
+            }
             return;
         }