mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 09:56:06 +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

4
src/network/mcpe/serializer/NetworkBinaryStream.php
View File

@ -529,7 +529,7 @@ class NetworkBinaryStream extends BinaryStream{
* Reads gamerules
* TODO: implement this properly
*
* @return array, members are in the structure [name => [type, value]]
* @return mixed[][], members are in the structure [name => [type, value]]
*
* @throws BadPacketException
* @throws BinaryDataException
@ -564,6 +564,8 @@ class NetworkBinaryStream extends BinaryStream{
/**
* Writes a gamerule array, members should be in the structure [name => [type, value]]
* TODO: implement this properly
*
* @param mixed[][] $rules
*/
public function putGameRules(array $rules) : void{
$this->putUnsignedVarInt(count($rules));