Separated XUID stuff from PlayerInfo into its own XboxLivePlayerInfo

src/network/mcpe/NetworkSession.php

@@ -97,6 +97,7 @@ use pocketmine\network\NetworkSessionManager;
 use pocketmine\player\GameMode;
 use pocketmine\player\Player;
 use pocketmine\player\PlayerInfo;
+use pocketmine\player\XboxLivePlayerInfo;
 use pocketmine\Server;
 use pocketmine\timings\Timings;
 use pocketmine\utils\TextFormat;
@@ -563,7 +564,7 @@ class NetworkSession{
 			return;
 		}
 		if($error === null){
-			if($authenticated and $this->info->getXuid() === ""){
+			if($authenticated and !($this->info instanceof XboxLivePlayerInfo)){
 				$error = "Expected XUID but none found";
 			}elseif($clientPubKey === null){
 				$error = "Missing client public key"; //failsafe
@@ -583,7 +584,7 @@ class NetworkSession{
 				$this->disconnect("disconnectionScreen.notAuthenticated");
 				return;
 			}
-			if($this->info->hasXboxData()){
+			if($this->info instanceof XboxLivePlayerInfo){
 				$this->logger->warning("Discarding unexpected XUID for non-authenticated player");
 				$this->info = $this->info->withoutXboxData();
 			}

src/network/mcpe/handler/LoginPacketHandler.php

@@ -41,6 +41,7 @@ use pocketmine\network\mcpe\protocol\types\login\ClientDataToSkinDataHelper;
 use pocketmine\network\mcpe\protocol\types\login\JwtChain;
 use pocketmine\player\Player;
 use pocketmine\player\PlayerInfo;
+use pocketmine\player\XboxLivePlayerInfo;
 use pocketmine\Server;
 use pocketmine\uuid\UUID;
 use function is_array;
@@ -116,14 +117,24 @@ class LoginPacketHandler extends PacketHandler{
 		}catch(\InvalidArgumentException $e){
 			throw BadPacketException::wrap($e, "Failed to parse login UUID");
 		}
+		if($extraData->XUID !== ""){
+			$playerInfo = new XboxLivePlayerInfo(
+				$extraData->XUID,
+				$extraData->displayName,
+				$uuid,
+				$skin,
+				$clientData->LanguageCode,
+				(array) $clientData
+			);
+		}else{
 			$playerInfo = new PlayerInfo(
 				$extraData->displayName,
 				$uuid,
 				$skin,
 				$clientData->LanguageCode,
-			$extraData->XUID,
 				(array) $clientData
 			);
+		}
 		($this->playerInfoConsumer)($playerInfo);
 
 		$ev = new PlayerPreLoginEvent(

src/player/Player.php

@@ -280,7 +280,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		$this->locale = $this->playerInfo->getLocale();
 
 		$this->uuid = $this->playerInfo->getUuid();
-		$this->xuid = $this->playerInfo->getXuid();
+		$this->xuid = $this->playerInfo instanceof XboxLivePlayerInfo ? $this->playerInfo->getXuid() : "";
 
 		$this->perm = new PermissibleBase($this);
 		$this->chunksPerTick = (int) $this->server->getConfigGroup()->getProperty("chunk-sending.per-tick", 4);

src/player/PlayerInfo.php

@@ -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
-		);
-	}
 }

src/player/XboxLivePlayerInfo.php

@@ -0,0 +1,59 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\player;
+
+use pocketmine\entity\Skin;
+use pocketmine\uuid\UUID;
+
+/**
+ * Encapsulates player info specific to players who are authenticated with XBOX Live.
+ */
+final class XboxLivePlayerInfo extends PlayerInfo{
+
+	/** @var string */
+	private $xuid;
+
+	public function __construct(string $xuid, string $username, UUID $uuid, Skin $skin, string $locale, array $extraData = []){
+		parent::__construct($username, $uuid, $skin, $locale, $extraData);
+		$this->xuid = $xuid;
+	}
+
+	public function getXuid() : string{
+		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() : PlayerInfo{
+		return new PlayerInfo(
+			$this->getUsername(),
+			$this->getUuid(),
+			$this->getSkin(),
+			$this->getLocale(),
+			$this->getExtraData()
+		);
+	}
+}