mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-09 23:39:43 +00:00
Code Issues Projects Releases Wiki Activity

LoginPacketHandler: use reference to new PlayerInfo directly, fixes a PHPStan level 8 error

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-06-17 21:29:16 +01:00
parent 7558f2cb12
commit eefb6ae8e7
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/mcpe/handler/LoginPacketHandler.php
View File

@ -124,17 +124,18 @@ class LoginPacketHandler extends PacketHandler{
}catch(\InvalidArgumentException $e){ }catch(\InvalidArgumentException $e){
throw BadPacketException::wrap($e, "Failed to parse login UUID"); throw BadPacketException::wrap($e, "Failed to parse login UUID");
} }
($this->playerInfoConsumer)(new PlayerInfo( $playerInfo = new PlayerInfo(
$extraData->displayName, $extraData->displayName,
$uuid, $uuid,
$skin, $skin,
$clientData->LanguageCode, $clientData->LanguageCode,
$extraData->XUID, $extraData->XUID,
(array) $clientData (array) $clientData
)); );
($this->playerInfoConsumer)($playerInfo);
$ev = new PlayerPreLoginEvent( $ev = new PlayerPreLoginEvent(
$this->session->getPlayerInfo(), $playerInfo,
$this->session->getIp(), $this->session->getIp(),
$this->session->getPort(), $this->session->getPort(),
$this->server->requiresAuthentication() $this->server->requiresAuthentication()

5
tests/phpstan/configs/l8-baseline.neon
View File

@ -485,11 +485,6 @@ parameters:
count: 1 count: 1
path: ../../../src/network/mcpe/encryption/PrepareEncryptionTask.php 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\\.$#" message: "#^Cannot call method getUsername\\(\\) on pocketmine\\\\player\\\\PlayerInfo\\|null\\.$#"
count: 2 count: 2