From 4d97827d44f7fe724b2d7557fb46dc64af6e1605 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Sat, 1 Nov 2014 17:39:09 +0100
Subject: [PATCH] Improved level switching for players

---
 src/pocketmine/entity/Entity.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php
index 274b284d6..0ddd9d416 100644
--- a/src/pocketmine/entity/Entity.php
+++ b/src/pocketmine/entity/Entity.php
@@ -745,14 +745,11 @@ abstract class Entity extends Location implements Metadatable{
 					$X = null;
 					$Z = null;
 					Level::getXZ($index, $X, $Z);
-					foreach($this->level->getChunkEntities($X, $Z) as $entity){
-						$entity->despawnFrom($this);
-					}
-					$this->level->freeChunk($X, $Z, $this);
+					$this->unloadChunk($X, $Z);
 				}
 			}
 		}
-		$this->setLevel($targetLevel, $this instanceof Player ? true : false); //Hard reference
+		$this->setLevel($targetLevel);
 		$this->level->addEntity($this);
 		if($this instanceof Player){
 			$this->usedChunks = [];