Make tab list work!
This commit is contained in:
parent
44ac36941f
commit
7733fbfb28
@ -106,7 +106,7 @@ public final class UserConnection implements ProxiedPlayer
|
|||||||
this.displayName = name;
|
this.displayName = name;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
this.tabList = getPendingConnection().getListener().getTabList().getDeclaredConstructor( ProxiedPlayer.class ).newInstance( this );
|
this.tabList = getPendingConnection().getListener().getTabList().getDeclaredConstructor().newInstance();
|
||||||
} catch ( ReflectiveOperationException ex )
|
} catch ( ReflectiveOperationException ex )
|
||||||
{
|
{
|
||||||
throw new RuntimeException( ex );
|
throw new RuntimeException( ex );
|
||||||
@ -240,7 +240,7 @@ public final class UserConnection implements ProxiedPlayer
|
|||||||
{
|
{
|
||||||
bungee.getLogger().log( Level.INFO, "[" + getName() + "] disconnected with: " + reason );
|
bungee.getLogger().log( Level.INFO, "[" + getName() + "] disconnected with: " + reason );
|
||||||
unsafe().sendPacket( new PacketFFKick( reason ) );
|
unsafe().sendPacket( new PacketFFKick( reason ) );
|
||||||
ch.getHandle().close();
|
ch.close();
|
||||||
if ( server != null )
|
if ( server != null )
|
||||||
{
|
{
|
||||||
server.disconnect( "Quitting" );
|
server.disconnect( "Quitting" );
|
||||||
|
@ -18,6 +18,7 @@ public class Custom extends TabListAdapter implements TabAPI
|
|||||||
/*========================================================================*/
|
/*========================================================================*/
|
||||||
private String[][] sent = new String[ ROWS ][ COLUMNS ];
|
private String[][] sent = new String[ ROWS ][ COLUMNS ];
|
||||||
private String[][] pending = new String[ ROWS ][ COLUMNS ];
|
private String[][] pending = new String[ ROWS ][ COLUMNS ];
|
||||||
|
private int last;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public synchronized void setSlot(int row, int column, String text)
|
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.checkNotNull( text, "text" );
|
||||||
Preconditions.checkArgument( text.length() <= 16, "text must be <= 16 chars" );
|
Preconditions.checkArgument( text.length() <= 16, "text must be <= 16 chars" );
|
||||||
Preconditions.checkArgument( !sentStuff.contains( text ), "list already contains %s", text );
|
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 )
|
if ( update )
|
||||||
{
|
{
|
||||||
update();
|
update();
|
||||||
@ -51,6 +53,10 @@ public class Custom extends TabListAdapter implements TabAPI
|
|||||||
{
|
{
|
||||||
for ( int j = 0; j < COLUMNS; j++ )
|
for ( int j = 0; j < COLUMNS; j++ )
|
||||||
{
|
{
|
||||||
|
if ( i * ROWS + j > last )
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
String text;
|
String text;
|
||||||
if ( pending[i][j] != null )
|
if ( pending[i][j] != null )
|
||||||
{
|
{
|
||||||
@ -58,7 +64,7 @@ public class Custom extends TabListAdapter implements TabAPI
|
|||||||
sentStuff.add( text );
|
sentStuff.add( text );
|
||||||
} else
|
} 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 ) );
|
getPlayer().unsafe().sendPacket( new PacketC9PlayerListItem( text, true, (short) 0 ) );
|
||||||
sent[i][j] = text;
|
sent[i][j] = text;
|
||||||
@ -73,10 +79,13 @@ public class Custom extends TabListAdapter implements TabAPI
|
|||||||
for ( int i = 0; i < ROWS; i++ )
|
for ( int i = 0; i < ROWS; i++ )
|
||||||
{
|
{
|
||||||
for ( int j = 0; j < COLUMNS; j++ )
|
for ( int j = 0; j < COLUMNS; j++ )
|
||||||
|
{
|
||||||
|
if ( sent[i][j] != null )
|
||||||
{
|
{
|
||||||
getPlayer().unsafe().sendPacket( new PacketC9PlayerListItem( sent[i][j], false, (short) 9999 ) );
|
getPlayer().unsafe().sendPacket( new PacketC9PlayerListItem( sent[i][j], false, (short) 9999 ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
sent = new String[ ROWS ][ COLUMNS ];
|
sent = new String[ ROWS ][ COLUMNS ];
|
||||||
sentStuff.clear();
|
sentStuff.clear();
|
||||||
}
|
}
|
||||||
@ -107,7 +116,7 @@ public class Custom extends TabListAdapter implements TabAPI
|
|||||||
|
|
||||||
private static char[] base(int n)
|
private static char[] base(int n)
|
||||||
{
|
{
|
||||||
String hex = Integer.toHexString( n );
|
String hex = Integer.toHexString( n + 1 );
|
||||||
char[] alloc = new char[ hex.length() * 2 ];
|
char[] alloc = new char[ hex.length() * 2 ];
|
||||||
for ( int i = 0; i < alloc.length; i++ )
|
for ( int i = 0; i < alloc.length; i++ )
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user