diff --git a/lib/playerPlugins/login.js b/lib/playerPlugins/login.js
index f406655..a047ce3 100644
--- a/lib/playerPlugins/login.js
+++ b/lib/playerPlugins/login.js
@@ -21,6 +21,7 @@ function inject(serv,player)
   {
     serv.entityMaxId++;
     player.entity=new Entity(serv.entityMaxId);
+    serv.entities[player.entity.id]=player.entity;
     player.username=player._client.username;
     serv.players.push(player);
     serv.uuidToPlayer[player._client.uuid] = player;
@@ -187,6 +188,7 @@ function inject(serv,player)
         }]
       });
       player._writeOthers('entity_destroy', {'entityIds': [player.entity.id]});
+      delete serv.entities[player.entity.id]
       player.emit('disconnect');
       var index = serv.players.indexOf(player);
       if (index > -1) {
diff --git a/lib/serverPlugins/players.js b/lib/serverPlugins/players.js
index 31f01aa..46e419e 100644
--- a/lib/serverPlugins/players.js
+++ b/lib/serverPlugins/players.js
@@ -5,4 +5,5 @@ function inject(serv)
   serv.entityMaxId=0;
   serv.players=[];
   serv.uuidToPlayer={};
+  serv.entities={};
 }
\ No newline at end of file