diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index b5156c16b0..e1ba68f932 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -198,6 +198,11 @@ public class EntityTrackerEntry {
             entityitem.locZ = (double) packet21pickupspawn.d / 32.0D;
             return packet21pickupspawn;
         } else if (this.tracker instanceof EntityPlayer) {
+            // CraftBukkit start - limit name length to 16 characters
+            if (((EntityHuman) this.tracker).name.length() > 16) {
+                ((EntityHuman) this.tracker).name = ((EntityHuman) this.tracker).name.substring(0, 16);
+            }
+            // CraftBukkit end
             return new Packet20NamedEntitySpawn((EntityHuman) this.tracker);
         } else {
             if (this.tracker instanceof EntityMinecart) {