From e7dbda922a5e8eb4a2f7e5529c6965febdbaac8b Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Mon, 13 Mar 2017 10:44:23 +0000
Subject: [PATCH] Rename some CommandBlockUpdatePacket fields

---
 .../mcpe/protocol/CommandBlockUpdatePacket.php  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php b/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php
index f99720e5f..cba3f9ad0 100644
--- a/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php
@@ -30,7 +30,7 @@ use pocketmine\network\mcpe\NetworkSession;
 class CommandBlockUpdatePacket extends DataPacket{
 	const NETWORK_ID = ProtocolInfo::COMMAND_BLOCK_UPDATE_PACKET;
 
-	public $isCommandBlockUpdate;
+	public $isBlock;
 
 	public $x;
 	public $y;
@@ -39,7 +39,7 @@ class CommandBlockUpdatePacket extends DataPacket{
 	public $isRedstoneMode;
 	public $isConditional;
 
-	public $eid;
+	public $minecartEid;
 
 	public $command;
 	public $lastOutput;
@@ -48,15 +48,16 @@ class CommandBlockUpdatePacket extends DataPacket{
 	public $shouldTrackOutput;
 
 	public function decode(){
-		$this->isCommandBlockUpdate = $this->getBool();
+		$this->isBlock = $this->getBool();
 
-		if($this->isCommandBlockUpdate){
+		if($this->isBlock){
 			$this->getBlockPosition($this->x, $this->y, $this->z);
 			$this->commandBlockMode = $this->getUnsignedVarInt();
 			$this->isRedstoneMode = $this->getBool();
 			$this->isConditional = $this->getBool();
 		}else{
-			$this->eid = $this->getEntityRuntimeId();
+			//Minecart with command block
+			$this->minecartEid = $this->getEntityRuntimeId();
 		}
 
 		$this->command = $this->getString();
@@ -68,15 +69,15 @@ class CommandBlockUpdatePacket extends DataPacket{
 
 	public function encode(){
 		$this->reset();
-		$this->putBool($this->isCommandBlockUpdate);
+		$this->putBool($this->isBlock);
 
-		if($this->isCommandBlockUpdate){
+		if($this->isBlock){
 			$this->putBlockPosition($this->x, $this->y, $this->z);
 			$this->putUnsignedVarInt($this->commandBlockMode);
 			$this->putBool($this->isRedstoneMode);
 			$this->putBool($this->isConditional);
 		}else{
-			$this->putEntityRuntimeId($this->eid);
+			$this->putEntityRuntimeId($this->minecartEid);
 		}
 
 		$this->putString($this->command);