diff --git a/proxy/src/main/java/net/md_5/bungee/tab/Global.java b/proxy/src/main/java/net/md_5/bungee/tab/Global.java index b04bbe81..56169d9c 100644 --- a/proxy/src/main/java/net/md_5/bungee/tab/Global.java +++ b/proxy/src/main/java/net/md_5/bungee/tab/Global.java @@ -70,17 +70,23 @@ public class Global extends TabList item.setUsername( p.getName() ); item.setDisplayName( ComponentSerializer.toString( TextComponent.fromLegacyText( p.getDisplayName() ) ) ); LoginResult loginResult = ( (UserConnection) p ).getPendingConnection().getLoginProfile(); - String[][] props = new String[ loginResult.getProperties().length ][]; - for ( int j = 0; j < props.length; j++ ) + if ( loginResult != null ) { - props[ j] = new String[] + String[][] props = new String[ loginResult.getProperties().length ][]; + for ( int j = 0; j < props.length; j++ ) { - loginResult.getProperties()[j].getName(), - loginResult.getProperties()[j].getValue(), - loginResult.getProperties()[j].getSignature() - }; + props[ j ] = new String[] + { + loginResult.getProperties()[ j ].getName(), + loginResult.getProperties()[ j ].getValue(), + loginResult.getProperties()[ j ].getSignature() + }; + } + item.setProperties( props ); + } else + { + item.setProperties( new String[0][0] ); } - item.setProperties( props ); item.setGamemode( ( (UserConnection) p ).getGamemode() ); item.setPing( p.getPing() ); } diff --git a/proxy/src/main/java/net/md_5/bungee/tab/TabList.java b/proxy/src/main/java/net/md_5/bungee/tab/TabList.java index e5974453..bab75b1c 100644 --- a/proxy/src/main/java/net/md_5/bungee/tab/TabList.java +++ b/proxy/src/main/java/net/md_5/bungee/tab/TabList.java @@ -36,17 +36,23 @@ public abstract class TabList { item.setUuid( player.getUniqueId() ); LoginResult loginResult = player.getPendingConnection().getLoginProfile(); - String[][] props = new String[ loginResult.getProperties().length ][]; - for ( int i = 0; i < props.length; i++ ) + if ( loginResult != null ) { - props[ i] = new String[] + String[][] props = new String[ loginResult.getProperties().length ][]; + for ( int i = 0; i < props.length; i++ ) { - loginResult.getProperties()[i].getName(), - loginResult.getProperties()[i].getValue(), - loginResult.getProperties()[i].getSignature() - }; + props[ i ] = new String[] + { + loginResult.getProperties()[ i ].getName(), + loginResult.getProperties()[ i ].getValue(), + loginResult.getProperties()[ i ].getSignature() + }; + } + item.setProperties( props ); + } else + { + item.setProperties( new String[ 0 ][ 0 ] ); } - item.setProperties( props ); if ( playerListItem.getAction() == PlayerListItem.Action.ADD_PLAYER || playerListItem.getAction() == PlayerListItem.Action.UPDATE_GAMEMODE ) { player.setGamemode( item.getGamemode() );