mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 02:42:58 +00:00
Code Issues Projects Releases Wiki Activity

Separated XUID stuff from PlayerInfo into its own XboxLivePlayerInfo

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-11-10 14:25:08 +00:00
parent c43f14a2d2
commit 6a266bcbd1
5 changed files with 83 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/player/PlayerInfo.php
View File

@ -40,8 +40,6 @@ class PlayerInfo{
private $skin;
/** @var string */
private $locale;
/** @var string */
private $xuid;
/**
* @var mixed[]
* @phpstan-var array<string, mixed>
@ -52,12 +50,11 @@ class PlayerInfo{
* @param mixed[] $extraData
* @phpstan-param array<string, mixed> $extraData
*/
public function __construct(string $username, UUID $uuid, Skin $skin, string $locale, string $xuid, array $extraData = []){
public function __construct(string $username, UUID $uuid, Skin $skin, string $locale, array $extraData = []){
$this->username = TextFormat::clean($username);
$this->uuid = $uuid;
$this->skin = $skin;
$this->locale = $locale;
$this->xuid = $xuid;
$this->extraData = $extraData;
}
@ -77,10 +74,6 @@ class PlayerInfo{
return $this->locale;
}
public function getXuid() : string{
return $this->xuid;
}
/**
* @return mixed[]
* @phpstan-return array<string, mixed>
@ -88,23 +81,4 @@ class PlayerInfo{
public function getExtraData() : array{
return $this->extraData;
}
public function hasXboxData() : bool{
return $this->xuid !== "";
}
/**
* Returns a new PlayerInfo with XBL player info stripped. This is used to ensure that non-XBL players can't spoof
* XBL data.
*/
public function withoutXboxData() : self{
return new self(
$this->username,
$this->uuid,
$this->skin,
$this->locale,
"",
$this->extraData
);
}
}