mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 18:32:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mcpe-1.2.5

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-10-31 21:52:16 +00:00
parent dd085b35cc b7cd8dbfa9
commit dcdea6a1f4
25 changed files with 249 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php
View File

@ -31,17 +31,17 @@ class EntityPickRequestPacket extends DataPacket{
const NETWORK_ID = ProtocolInfo::ENTITY_PICK_REQUEST_PACKET;
/** @var int */
public $entityTypeId;
public $entityUniqueId;
/** @var int */
public $hotbarSlot;
protected function decodePayload(){
$this->entityTypeId = $this->getLLong();
$this->entityUniqueId = $this->getLLong();
$this->hotbarSlot = $this->getByte();
}
protected function encodePayload(){
$this->putLLong($this->entityTypeId);
$this->putLLong($this->entityUniqueId);
$this->putByte($this->hotbarSlot);
}

1
src/pocketmine/network/mcpe/protocol/types/WindowTypes.php
View File

@ -45,5 +45,6 @@ interface WindowTypes{
const STRUCTURE_EDITOR = 14;
const TRADING = 15;
const COMMAND_BLOCK = 16;
const JUKEBOX = 17;
}