From 76052b92d3d625ca774e36c4a6fe974f91387cde Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Fri, 8 May 2015 20:32:12 +0100
Subject: [PATCH] Don't send a Kick during the STATUS protocol as it doesn't
 support it

---
 .../main/java/net/md_5/bungee/connection/InitialHandler.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index f69c53633..93f19ac64 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -537,7 +537,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                 @Override
                 public void run()
                 {
-                    unsafe().sendPacket( new Kick( ComponentSerializer.toString( reason ) ) );
+                    if (thisState != State.STATUS && thisState != State.PING)
+                    {
+                        unsafe().sendPacket( new Kick( ComponentSerializer.toString( reason ) ) );
+                    }
                     ch.close();
                 }
             }, 500, TimeUnit.MILLISECONDS );