diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index cef0981eb4..db9b954008 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -334,4 +334,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
         this.pitch = f2;
         this.yaw = f3;
     }
+
+    // Craftbukkit start
+    @Override
+    public String toString() {
+        return super.toString() + "(" + name + " at " + locX + "," + locY + "," + locZ + ")";
+    }
+    // Craftbukkit end
 }