Merge commit '38a06f76f'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/network/mcpe/protocol/LoginPacket.php
This commit is contained in:
Dylan K. Taylor 2020-05-20 20:11:43 +01:00
commit 82bc59f480

View File

@ -37,8 +37,6 @@ use function strlen;
class LoginPacket extends DataPacket implements ServerboundPacket{
public const NETWORK_ID = ProtocolInfo::LOGIN_PACKET;
public const EDITION_POCKET = 0;
/** @var int */
public $protocol;