From 3a214b7ce6fb434d4fa418e8f23f10da02f08141 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Thu, 13 Jul 2017 12:21:26 +0100
Subject: [PATCH] Cleaned up isEncoded mess

---
 src/pocketmine/Server.php                           | 2 --
 src/pocketmine/inventory/CraftingManager.php        | 1 -
 src/pocketmine/inventory/PlayerInventory.php        | 2 --
 src/pocketmine/network/mcpe/RakLibInterface.php     | 1 -
 src/pocketmine/network/mcpe/protocol/DataPacket.php | 1 +
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index 0c9a7e96e..99f8de969 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -1817,7 +1817,6 @@ class Server{
 	 */
 	public function broadcastPacket(array $players, DataPacket $packet){
 		$packet->encode();
-		$packet->isEncoded = true;
 		$this->batchPackets($players, [$packet], false);
 	}
 
@@ -1867,7 +1866,6 @@ class Server{
 	public function broadcastPacketsCallback(BatchPacket $pk, array $identifiers, bool $immediate = false){
 		if(!$pk->isEncoded){
 			$pk->encode();
-			$pk->isEncoded = true;
 		}
 
 		if($immediate){
diff --git a/src/pocketmine/inventory/CraftingManager.php b/src/pocketmine/inventory/CraftingManager.php
index aca85258b..208bdcdcf 100644
--- a/src/pocketmine/inventory/CraftingManager.php
+++ b/src/pocketmine/inventory/CraftingManager.php
@@ -112,7 +112,6 @@ class CraftingManager{
 		}
 
 		$pk->encode();
-		$pk->isEncoded = true;
 
 		$this->craftingDataCache = $pk;
 		Timings::$craftingDataCacheRebuildTimer->stopTiming();
diff --git a/src/pocketmine/inventory/PlayerInventory.php b/src/pocketmine/inventory/PlayerInventory.php
index 994cfd5f7..52ba0da8d 100644
--- a/src/pocketmine/inventory/PlayerInventory.php
+++ b/src/pocketmine/inventory/PlayerInventory.php
@@ -420,7 +420,6 @@ class PlayerInventory extends BaseInventory{
 		$pk->entityRuntimeId = $this->getHolder()->getId();
 		$pk->slots = $armor;
 		$pk->encode();
-		$pk->isEncoded = true;
 
 		foreach($target as $player){
 			if($player === $this->getHolder()){
@@ -468,7 +467,6 @@ class PlayerInventory extends BaseInventory{
 		$pk->entityRuntimeId = $this->getHolder()->getId();
 		$pk->slots = $armor;
 		$pk->encode();
-		$pk->isEncoded = true;
 
 		foreach($target as $player){
 			if($player === $this->getHolder()){
diff --git a/src/pocketmine/network/mcpe/RakLibInterface.php b/src/pocketmine/network/mcpe/RakLibInterface.php
index 4239eaa39..20882e28e 100644
--- a/src/pocketmine/network/mcpe/RakLibInterface.php
+++ b/src/pocketmine/network/mcpe/RakLibInterface.php
@@ -200,7 +200,6 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
 			$identifier = $this->identifiers[$h];
 			if(!$packet->isEncoded){
 				$packet->encode();
-				$packet->isEncoded = true;
 			}
 
 			if($packet instanceof BatchPacket){
diff --git a/src/pocketmine/network/mcpe/protocol/DataPacket.php b/src/pocketmine/network/mcpe/protocol/DataPacket.php
index d251f1d7a..d7ec82b6c 100644
--- a/src/pocketmine/network/mcpe/protocol/DataPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/DataPacket.php
@@ -70,6 +70,7 @@ abstract class DataPacket extends BinaryStream{
 	public function encode(){
 		$this->reset();
 		$this->encodePayload();
+		$this->isEncoded = true;
 	}
 
 	/**