From e48599921876f381ae1a8c306ea3fb9e664d7bf9 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Wed, 12 Jul 2017 12:26:37 +0100
Subject: [PATCH] Just cut the adapter loose instead of needing extra fields
 for this

---
 src/pocketmine/Player.php                                  | 6 ++++--
 .../network/mcpe/PlayerNetworkSessionAdapter.php           | 7 -------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index bbd5a395d..6d00a8f81 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -3165,7 +3165,9 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
 	 * @param DataPacket $packet
 	 */
 	public function handleDataPacket(DataPacket $packet){
-		$this->sessionAdapter->handleDataPacket($packet);
+		if($this->sessionAdapter !== null){
+			$this->sessionAdapter->handleDataPacket($packet);
+		}
 	}
 
 	/**
@@ -3389,7 +3391,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
 					$this->directDataPacket($pk);
 				}
 
-				$this->sessionAdapter->connected = false;
+				$this->sessionAdapter = null;
 				$this->connected = false;
 
 				$this->server->getPluginManager()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_USERS, $this);
diff --git a/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php b/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php
index b6ea50dab..7aa8d3251 100644
--- a/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php
+++ b/src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php
@@ -70,9 +70,6 @@ class PlayerNetworkSessionAdapter extends BaseNetworkSession{
 	/** @var Player */
 	private $player;
 
-	/** @var bool */
-	public $connected = true;
-
 	public function __construct(Server $server, Player $player){
 		$this->server = $server;
 		$this->player = $player;
@@ -83,10 +80,6 @@ class PlayerNetworkSessionAdapter extends BaseNetworkSession{
 	}
 
 	public function handleDataPacket(DataPacket $packet){
-		if($this->connected === false){
-			return;
-		}
-
 		//TODO: Remove this hack once InteractPacket spam issue is fixed
 		if($packet->buffer === "\x21\x04\x00"){
 			return;