Merge pull request #1687 from yueh/fix-1686

Fixes #1686: Let PlayerRegistry handle nonexistent players
2015-07-24 22:26:00 +02:00
parent 3826b3b51f ff3e51018f
commit 48d1a5aa88
2 changed files with 9 additions and 8 deletions
@@ -35,13 +35,18 @@ public class PlayerRegistry implements IPlayerRegistry
 	@Override
 	public int getID( GameProfile username )
 	{
+		if( username == null || !username.isComplete() )
+		{
+			return -1;
+		}
+
 		return WorldData.instance().playerData().getPlayerID( username );
 	}

 	@Override
 	public int getID( EntityPlayer player )
 	{
-		return WorldData.instance().playerData().getPlayerID( player.getGameProfile() );
+		return this.getID( player.getGameProfile() );
 	}

 	@Nullable