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 commit 'fc0619ee6e4fa08aba2719e58a9289edd11f0b6e'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/network/mcpe/protocol/AddItemActorPacket.php
#	src/network/mcpe/protocol/AddPlayerPacket.php
#	src/network/mcpe/protocol/SetActorDataPacket.php
#	src/network/mcpe/serializer/NetworkBinaryStream.php
#	src/pocketmine/network/mcpe/protocol/AddActorPacket.php
#	src/pocketmine/network/mcpe/protocol/LoginPacket.php
This commit is contained in:
Dylan K. Taylor
2020-01-31 19:42:07 +00:00
parent 465d8cda79 fc0619ee6e
commit 20d39846b7
6 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/mcpe/protocol/StartGamePacket.php
View File

@ -103,7 +103,7 @@ class StartGamePacket extends DataPacket implements ClientboundPacket{
public $commandsEnabled;
/** @var bool */
public $isTexturePacksRequired = true;
/** @var array */
/** @var mixed[][] */
public $gameRules = [ //TODO: implement this
"naturalregeneration" => [1, false] //Hack for client side regeneration
];
@ -153,7 +153,7 @@ class StartGamePacket extends DataPacket implements ClientboundPacket{
/** @var ListTag|null */
public $blockTable = null;
/** @var array|null string (name) => int16 (legacyID) */
/** @var int[]|null string (name) => int16 (legacyID) */
public $itemTable = null;
protected function decodePayload() : void{
@ -300,6 +300,9 @@ class StartGamePacket extends DataPacket implements ClientboundPacket{
$this->putString($this->multiplayerCorrelationId);
}
/**
* @param int[] $table
*/
private static function serializeItemTable(array $table) : string{
$stream = new NetworkBinaryStream();
$stream->putUnsignedVarInt(count($table));