From 7733fbfb2814845f983cb0fad6529bde1ecbc73c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 8 Jun 2013 14:43:03 +1000
Subject: [PATCH] Make tab list work!

---
 .../java/net/md_5/bungee/UserConnection.java  |  4 ++--
 .../java/net/md_5/bungee/tablist/Custom.java  | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 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 6dd7bc49f..25c23eadf 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -106,7 +106,7 @@ public final class UserConnection implements ProxiedPlayer
         this.displayName = name;
         try
         {
-            this.tabList = getPendingConnection().getListener().getTabList().getDeclaredConstructor( ProxiedPlayer.class ).newInstance( this );
+            this.tabList = getPendingConnection().getListener().getTabList().getDeclaredConstructor().newInstance();
         } catch ( ReflectiveOperationException ex )
         {
             throw new RuntimeException( ex );
@@ -240,7 +240,7 @@ public final class UserConnection implements ProxiedPlayer
         {
             bungee.getLogger().log( Level.INFO, "[" + getName() + "] disconnected with: " + reason );
             unsafe().sendPacket( new PacketFFKick( reason ) );
-            ch.getHandle().close();
+            ch.close();
             if ( server != null )
             {
                 server.disconnect( "Quitting" );
diff --git a/proxy/src/main/java/net/md_5/bungee/tablist/Custom.java b/proxy/src/main/java/net/md_5/bungee/tablist/Custom.java
index d15fca5bc..eba116b20 100644
--- a/proxy/src/main/java/net/md_5/bungee/tablist/Custom.java
+++ b/proxy/src/main/java/net/md_5/bungee/tablist/Custom.java
@@ -18,6 +18,7 @@ public class Custom extends TabListAdapter implements TabAPI
     /*========================================================================*/
     private String[][] sent = new String[ ROWS ][ COLUMNS ];
     private String[][] pending = new String[ ROWS ][ COLUMNS ];
+    private int last;
 
     @Override
     public synchronized void setSlot(int row, int column, String text)
@@ -33,9 +34,10 @@ public class Custom extends TabListAdapter implements TabAPI
         Preconditions.checkNotNull( text, "text" );
         Preconditions.checkArgument( text.length() <= 16, "text must be <= 16 chars" );
         Preconditions.checkArgument( !sentStuff.contains( text ), "list already contains %s", text );
-        Preconditions.checkArgument( !ChatColor.stripColor( text ).equals( text ), "Text cannot consist entirely of colour codes" );
+        Preconditions.checkArgument( !ChatColor.stripColor( text ).isEmpty(), "Text cannot consist entirely of colour codes" );
 
-        pending[ROWS + 1][COLUMNS + 1] = text;
+        pending[--row][--column] = text;
+        last = ( row * ROWS + column > last ) ? ( row * ROWS + column ) : last;
         if ( update )
         {
             update();
@@ -51,6 +53,10 @@ public class Custom extends TabListAdapter implements TabAPI
         {
             for ( int j = 0; j < COLUMNS; j++ )
             {
+                if ( i * ROWS + j > last )
+                {
+                    return;
+                }
                 String text;
                 if ( pending[i][j] != null )
                 {
@@ -58,7 +64,7 @@ public class Custom extends TabListAdapter implements TabAPI
                     sentStuff.add( text );
                 } else
                 {
-                    text = new StringBuilder().append( ChatColor.COLOR_CHAR ).append( base( i ) ).append( ChatColor.COLOR_CHAR ).append( base( j ) ).toString();
+                    text = new StringBuilder().append( base( i ) ).append( base( j ) ).toString();
                 }
                 getPlayer().unsafe().sendPacket( new PacketC9PlayerListItem( text, true, (short) 0 ) );
                 sent[i][j] = text;
@@ -74,7 +80,10 @@ public class Custom extends TabListAdapter implements TabAPI
         {
             for ( int j = 0; j < COLUMNS; j++ )
             {
-                getPlayer().unsafe().sendPacket( new PacketC9PlayerListItem( sent[i][j], false, (short) 9999 ) );
+                if ( sent[i][j] != null )
+                {
+                    getPlayer().unsafe().sendPacket( new PacketC9PlayerListItem( sent[i][j], false, (short) 9999 ) );
+                }
             }
         }
         sent = new String[ ROWS ][ COLUMNS ];
@@ -107,7 +116,7 @@ public class Custom extends TabListAdapter implements TabAPI
 
     private static char[] base(int n)
     {
-        String hex = Integer.toHexString( n );
+        String hex = Integer.toHexString( n + 1 );
         char[] alloc = new char[ hex.length() * 2 ];
         for ( int i = 0; i < alloc.length; i++ )
         {