From 25fb5140a2dba99c5e076849ac11e051a2970807 Mon Sep 17 00:00:00 2001 From: Wumpotamus Date: Wed, 29 Apr 2020 19:42:59 -0400 Subject: [PATCH] Merge #3456: Added protocol DeviceOS constants close #3456 since this is a protocol addition and not API, this belongs on stable so that protocol changes can consistently use it without worrying about branch compatibility. --- .../network/mcpe/protocol/AddPlayerPacket.php | 3 +- .../network/mcpe/protocol/types/DeviceOS.php | 44 +++++++++++++++++++ .../mcpe/protocol/types/PlayerListEntry.php | 2 +- 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 src/pocketmine/network/mcpe/protocol/types/DeviceOS.php diff --git a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php index fa4fbf64f..2e249a265 100644 --- a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php @@ -28,6 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\item\Item; use pocketmine\math\Vector3; use pocketmine\network\mcpe\NetworkSession; +use pocketmine\network\mcpe\protocol\types\DeviceOS; use pocketmine\network\mcpe\protocol\types\EntityLink; use pocketmine\utils\UUID; use function count; @@ -84,7 +85,7 @@ class AddPlayerPacket extends DataPacket{ /** @var string */ public $deviceId = ""; //TODO: fill player's device ID (???) /** @var int */ - public $buildPlatform = -1; + public $buildPlatform = DeviceOS::UNKNOWN; protected function decodePayload(){ $this->uuid = $this->getUUID(); diff --git a/src/pocketmine/network/mcpe/protocol/types/DeviceOS.php b/src/pocketmine/network/mcpe/protocol/types/DeviceOS.php new file mode 100644 index 000000000..97a6fe5eb --- /dev/null +++ b/src/pocketmine/network/mcpe/protocol/types/DeviceOS.php @@ -0,0 +1,44 @@ +