From f0f9bccb4b00de832d8e4498c4b98e1edb2a8a3e Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Sun, 24 Aug 2014 15:55:52 +0200
Subject: [PATCH] Fixed #1960

---
 src/pocketmine/Player.php        | 3 ++-
 src/pocketmine/entity/Entity.php | 4 ++--
 src/pocketmine/tile/Tile.php     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 4b9c88ca4..bf0120fad 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -2107,7 +2107,6 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 		$this->tasks = [];
 
 		if($this->connected === true){
-			parent::close();
 			if($this->username != ""){
 				$this->server->getPluginManager()->callEvent($ev = new PlayerQuitEvent($this, $message));
 				if($this->loggedIn === true){
@@ -2132,6 +2131,8 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 			$this->usedChunks = [];
 			$this->loadQueue = [];
 			unset($this->buffer);
+
+			parent::close();
 		}
 	}
 
diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php
index edc8719c0..38b5debc6 100644
--- a/src/pocketmine/entity/Entity.php
+++ b/src/pocketmine/entity/Entity.php
@@ -870,7 +870,7 @@ abstract class Entity extends Position implements Metadatable{
 	 *
 	 * @return Block[]
 	 */
-	protected function checkBlockCollision(&$list = array()){
+	protected function checkBlockCollision(&$list = []){
 		$minX = floor($this->boundingBox->minX + 0.001);
 		$minY = floor($this->boundingBox->minY + 0.001);
 		$minZ = floor($this->boundingBox->minZ + 0.001);
@@ -1055,7 +1055,7 @@ abstract class Entity extends Position implements Metadatable{
 				$level->removeEntity($this);
 			}
 			$this->despawnFromAll();
-			unset($this->level);
+			$this->level = null;
 		}
 	}
 
diff --git a/src/pocketmine/tile/Tile.php b/src/pocketmine/tile/Tile.php
index cc14164fe..64fd06a4e 100644
--- a/src/pocketmine/tile/Tile.php
+++ b/src/pocketmine/tile/Tile.php
@@ -117,7 +117,7 @@ abstract class Tile extends Position{
 			if(($level = $this->getLevel()) instanceof Level){
 				$level->removeTile($this);
 			}
-			unset($this->level);
+			$this->level = null;
 		}
 	}