diff --git a/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
index 7fc7ace765..406e127a6d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
@@ -7,11 +7,12 @@ import org.bukkit.Location;
 import org.bukkit.Player;
 
 public class CraftPlayer extends CraftHumanEntity implements Player {
-
     private EntityPlayerMP entity;
+    private String name;
 
     public CraftPlayer(CraftServer server, EntityPlayerMP entity) {
         super(server, entity);
+        this.name = getName();
         this.entity = entity;
     }
 
@@ -47,6 +48,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         entity.a.a(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
     }
 
+    public String getDisplayName() {
+        return name;
+    }
+
+    public void getDisplayName(final String name) {
+        this.name = name;
+    }
+
     @Override
     public String toString() {
         return "CraftPlayer{" + "name=" + getName() + '}';