diff --git a/src/network/mcpe/handler/LoginPacketHandler.php b/src/network/mcpe/handler/LoginPacketHandler.php index 7203f4bd0..c6577d625 100644 --- a/src/network/mcpe/handler/LoginPacketHandler.php +++ b/src/network/mcpe/handler/LoginPacketHandler.php @@ -124,17 +124,18 @@ class LoginPacketHandler extends PacketHandler{ }catch(\InvalidArgumentException $e){ throw BadPacketException::wrap($e, "Failed to parse login UUID"); } - ($this->playerInfoConsumer)(new PlayerInfo( + $playerInfo = new PlayerInfo( $extraData->displayName, $uuid, $skin, $clientData->LanguageCode, $extraData->XUID, (array) $clientData - )); + ); + ($this->playerInfoConsumer)($playerInfo); $ev = new PlayerPreLoginEvent( - $this->session->getPlayerInfo(), + $playerInfo, $this->session->getIp(), $this->session->getPort(), $this->server->requiresAuthentication() diff --git a/tests/phpstan/configs/l8-baseline.neon b/tests/phpstan/configs/l8-baseline.neon index 19c3f1f46..8b49c9680 100644 --- a/tests/phpstan/configs/l8-baseline.neon +++ b/tests/phpstan/configs/l8-baseline.neon @@ -485,11 +485,6 @@ parameters: count: 1 path: ../../../src/network/mcpe/encryption/PrepareEncryptionTask.php - - - message: "#^Parameter \\#1 \\$playerInfo of class pocketmine\\\\event\\\\player\\\\PlayerPreLoginEvent constructor expects pocketmine\\\\player\\\\PlayerInfo, pocketmine\\\\player\\\\PlayerInfo\\|null given\\.$#" - count: 1 - path: ../../../src/network/mcpe/handler/LoginPacketHandler.php - - message: "#^Cannot call method getUsername\\(\\) on pocketmine\\\\player\\\\PlayerInfo\\|null\\.$#" count: 2