Merge commit 'e982a57cb'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/network/mcpe/protocol/StartGamePacket.php
This commit is contained in:
Dylan K. Taylor 2020-05-20 19:59:46 +01:00
commit 64f0b2deb6

View File

@ -29,6 +29,7 @@ use pocketmine\math\Vector3;
use pocketmine\nbt\tag\ListTag;
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\PlayerPermissions;
use function count;
@ -72,7 +73,7 @@ class StartGamePacket extends DataPacket implements ClientboundPacket{
/** @var int */
public $time = -1;
/** @var int */
public $eduEditionOffer = 0;
public $eduEditionOffer = EducationEditionOffer::NONE;
/** @var bool */
public $hasEduFeaturesEnabled = false;
/** @var float */