mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 17:59:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'e982a57cb'

Browse Source 
# 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
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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