From 31a7410acdb11686ddaf5af66c9474bd8067a897 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Mon, 23 Jun 2014 15:25:44 +0200
Subject: [PATCH] Fixed players and entities getting despawned

---
 src/pocketmine/entity/Entity.php | 3 ++-
 src/pocketmine/level/Level.php   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php
index 3bb024f7a..de9346dc9 100644
--- a/src/pocketmine/entity/Entity.php
+++ b/src/pocketmine/entity/Entity.php
@@ -610,8 +610,9 @@ abstract class Entity extends Position implements Metadatable{
 			$pk->started = $this->getLevel()->stopTime == false;
 			$this->dataPacket($pk);
 		}
-		$this->spawnToAll();
 		$this->chunk = null;
+
+		return true;
 	}
 
 	public function getPosition(){
diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index ebb9b31c8..928b17646 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -275,7 +275,7 @@ class Level implements ChunkManager, Metadatable{
 	public function useChunk($X, $Z, Player $player){
 		$index = Level::chunkHash($X, $Z);
 		$this->loadChunk($X, $Z);
-		$this->usedChunks[$index][spl_object_hash($player)] = $player;
+		$this->usedChunks[$index][$player->getID()] = $player;
 	}
 
 	/**
@@ -299,7 +299,7 @@ class Level implements ChunkManager, Metadatable{
 	 * @param Player $player
 	 */
 	public function freeChunk($X, $Z, Player $player){
-		unset($this->usedChunks[Level::chunkHash($X, $Z)][spl_object_hash($player)]);
+		unset($this->usedChunks[Level::chunkHash($X, $Z)][$player->getID()]);
 	}
 
 	/**