From cb0c0100294c0f9b711406347c14ebe4a0f03743 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 09:49:55 +1100
Subject: [PATCH] Fix #136

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

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 353a82c0..9cd9664d 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -64,8 +64,8 @@ public class UserConnection extends GenericConnection implements ProxiedPlayer
         this.pendingConnection = pendingConnection;
         this.forgeLogin = forgeLogin;
         this.loginMessages = loginMessages;
-        name = handshake.username;
-        displayName = handshake.username;
+        name = handshake.username.substring( Math.min( handshake.username.length(), 16 ) );
+        displayName = name;
 
         Collection<String> g = ProxyServer.getInstance().getConfigurationAdapter().getGroups( name );
         for ( String s : g )
@@ -511,7 +511,7 @@ public class UserConnection extends GenericConnection implements ProxiedPlayer
                             }
                             break;
                         case 0xFF:
-                            disconnect(new PacketFFKick( packet ).message );
+                            disconnect( new PacketFFKick( packet ).message );
                             break outer;
                     }