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 '260ac47588c76a2e6814cfba46773a990fb8c5da'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/Server.php
#	src/lang/Language.php
#	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/permission/Permission.php
#	src/pocketmine/block/Leaves.php
#	src/pocketmine/entity/DataPropertyManager.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/item/Banner.php
#	src/pocketmine/item/Item.php
#	src/pocketmine/level/format/io/LevelProvider.php
#	src/pocketmine/level/format/io/LevelProviderManager.php
#	src/pocketmine/network/mcpe/protocol/AddActorPacket.php
#	src/pocketmine/network/mcpe/protocol/LoginPacket.php
#	src/pocketmine/tile/Banner.php
#	src/scheduler/BulkCurlTask.php
#	src/updater/AutoUpdater.php
#	src/utils/Config.php
#	src/utils/Utils.php
#	src/world/generator/Flat.php
#	src/world/generator/Generator.php
This commit is contained in:
Dylan K. Taylor
2020-01-31 21:07:34 +00:00
parent 96ac95798b 260ac47588
commit cb16f5c142
39 changed files with 164 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,6 +297,7 @@ class NetworkBinaryStream extends BinaryStream{
* Decodes entity metadata from the stream.
*
* @return MetadataProperty[]
* @phpstan-return array<int, MetadataProperty>
*
* @throws BadPacketException
* @throws BinaryDataException
@ -334,6 +335,7 @@ class NetworkBinaryStream extends BinaryStream{
* Writes entity metadata to the packet buffer.
*
* @param MetadataProperty[] $metadata
* @phpstan-param array<int, MetadataProperty> $metadata
*/
public function putEntityMetadata(array $metadata) : void{
$this->putUnsignedVarInt(count($metadata));
@ -530,6 +532,7 @@ class NetworkBinaryStream extends BinaryStream{
* TODO: implement this properly
*
* @return mixed[][], members are in the structure [name => [type, value]]
* @phpstan-return array<string, array{0: int, 1: bool|int|float}>
*
* @throws BadPacketException
* @throws BinaryDataException
@ -566,6 +569,7 @@ class NetworkBinaryStream extends BinaryStream{
* TODO: implement this properly
*
* @param mixed[][] $rules
* @phpstan-param array<string, array{0: int, 1: bool|int|float}> $rules
*/
public function putGameRules(array $rules) : void{
$this->putUnsignedVarInt(count($rules));