Merge commit '02cc370855e543e64e34388c99fb439d206323ae'

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

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\GeneratorType;
use pocketmine\network\mcpe\protocol\types\PlayerPermissions;
use function count;
@ -55,7 +56,7 @@ class StartGamePacket extends DataPacket implements ClientboundPacket{
/** @var int */
public $dimension;
/** @var int */
public $generator = 1; //default infinite - 0 old, 1 infinite, 2 flat
public $generator = GeneratorType::OVERWORLD;
/** @var int */
public $worldGamemode;
/** @var int */