Merge commit 'f3089f577'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/network/mcpe/protocol/StartGamePacket.php
This commit is contained in:
Dylan K. Taylor 2020-05-20 20:05:48 +01:00
commit 5caae278cf

View File

@ -31,6 +31,7 @@ use pocketmine\network\mcpe\protocol\serializer\NetworkBinaryStream;
use pocketmine\network\mcpe\protocol\types\CacheableNbt;
use pocketmine\network\mcpe\protocol\types\EducationEditionOffer;
use pocketmine\network\mcpe\protocol\types\GeneratorType;
use pocketmine\network\mcpe\protocol\types\MultiplayerGameVisibility;
use pocketmine\network\mcpe\protocol\types\PlayerPermissions;
use function count;
@ -87,9 +88,9 @@ class StartGamePacket extends DataPacket implements ClientboundPacket{
/** @var bool */
public $hasLANBroadcast = true;
/** @var int */
public $xboxLiveBroadcastMode = 0; //TODO: find values
public $xboxLiveBroadcastMode = MultiplayerGameVisibility::FRIENDS_OF_FRIENDS;
/** @var int */
public $platformBroadcastMode = 0;
public $platformBroadcastMode = MultiplayerGameVisibility::FRIENDS_OF_FRIENDS;
/** @var bool */
public $commandsEnabled;
/** @var bool */