diff --git a/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java b/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java
index a600dc9..b125ba2 100644
--- a/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java
+++ b/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java
@@ -1045,7 +1045,8 @@
 	{
 		String meta = getMeta("tablistcolor");
 		EnumChatFormatting color = meta.isEmpty() ? null : BasicTypeParser.parseColor(meta);
-		return color == null ? getCommandSenderName() : color.toString() + getCommandSenderName();
+		String name = color == null ? getCommandSenderName() : color.toString() + getCommandSenderName();
+		return name.length() > 16 ? name.substring(0, 16) : name;
 	}
 
 	public String translate(String key)