mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-06 01:51:51 +00:00
Code Issues Projects Releases Wiki Activity

PlayerListPacket: fixup on platformChatId stuff

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-04-07 10:33:24 +01:00
parent 4b16be7e0b
commit 9a5f9c8586
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/network/mcpe/protocol/PlayerListPacket.php
View File

@ -73,7 +73,7 @@ class PlayerListPacket extends DataPacket{
$geometryData $geometryData
); );
$entry->xboxUserId = $this->getString(); $entry->xboxUserId = $this->getString();
$this->getString(); //unknown $entry->platformChatId = $this->getString();
}else{ }else{
$entry->uuid = $this->getUUID(); $entry->uuid = $this->getUUID();
} }
@ -98,7 +98,7 @@ class PlayerListPacket extends DataPacket{
$this->putString($entry->skin->getGeometryName()); $this->putString($entry->skin->getGeometryName());
$this->putString($entry->skin->getGeometryData()); $this->putString($entry->skin->getGeometryData());
$this->putString($entry->xboxUserId); $this->putString($entry->xboxUserId);
$this->putString(""); $this->putString($entry->platformChatId);
}else{ }else{
$this->putUUID($entry->uuid); $this->putUUID($entry->uuid);
} }

7
src/pocketmine/network/mcpe/protocol/types/PlayerListEntry.php
View File

@ -38,12 +38,12 @@ class PlayerListEntry{
public $thirdPartyName = ""; public $thirdPartyName = "";
/** @var int */ /** @var int */
public $platform = 0; public $platform = 0;
/** @var string */
public $platformChatId = "";
/** @var Skin */ /** @var Skin */
public $skin; public $skin;
/** @var string */ /** @var string */
public $xboxUserId; public $xboxUserId;
/** @var string */
public $platformChatId = "";
public static function createRemovalEntry(UUID $uuid) : PlayerListEntry{ public static function createRemovalEntry(UUID $uuid) : PlayerListEntry{
$entry = new PlayerListEntry(); $entry = new PlayerListEntry();
@ -52,7 +52,7 @@ class PlayerListEntry{
return $entry; return $entry;
} }
public static function createAdditionEntry(UUID $uuid, int $entityUniqueId, string $username, string $thirdPartyName, int $platform, Skin $skin, string $xboxUserId = "") : PlayerListEntry{ public static function createAdditionEntry(UUID $uuid, int $entityUniqueId, string $username, string $thirdPartyName, int $platform, Skin $skin, string $xboxUserId = "", string $platformChatId = "") : PlayerListEntry{
$entry = new PlayerListEntry(); $entry = new PlayerListEntry();
$entry->uuid = $uuid; $entry->uuid = $uuid;
$entry->entityUniqueId = $entityUniqueId; $entry->entityUniqueId = $entityUniqueId;
@ -61,6 +61,7 @@ class PlayerListEntry{
$entry->platform = $platform; $entry->platform = $platform;
$entry->skin = $skin; $entry->skin = $skin;
$entry->xboxUserId = $xboxUserId; $entry->xboxUserId = $xboxUserId;
$entry->platformChatId = $platformChatId;
return $entry; return $entry;
} }