diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 02beea654c..3b835a451a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -120,6 +120,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             server.getServer().f.d.b(entity);
 
             entity.c = new ItemInWorldManager(((CraftWorld)location.getWorld()).getHandle());
+            entity.c.a = entity;
         }
         entity.world = ((CraftWorld)location.getWorld()).getHandle();
         entity.b(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());