From 7cdd26add5a13b2bb0afcf69b4bd3b8fd87c264c Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 10 May 2020 11:23:11 +0100 Subject: [PATCH] Player: make handleLogin() less unreadable --- src/pocketmine/Player.php | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 4cf952e07..bf60adc5d 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -1858,12 +1858,25 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ $animations = []; foreach($packet->clientData["AnimatedImageData"] as $animation){ - $animations[] = new SkinAnimation(new SkinImage($animation["ImageHeight"], $animation["ImageWidth"], base64_decode($animation["Image"], true)), $animation["Type"], $animation["Frames"]); + $animations[] = new SkinAnimation( + new SkinImage( + $animation["ImageHeight"], + $animation["ImageWidth"], + base64_decode($animation["Image"], true)), + $animation["Type"], + $animation["Frames"] + ); } $personaPieces = []; foreach($packet->clientData["PersonaPieces"] as $piece){ - $personaPieces[] = new PersonaSkinPiece($piece["PieceId"], $piece["PieceType"], $piece["PackId"], $piece["IsDefault"], $piece["ProductId"]); + $personaPieces[] = new PersonaSkinPiece( + $piece["PieceId"], + $piece["PieceType"], + $piece["PackId"], + $piece["IsDefault"], + $piece["ProductId"] + ); } $pieceTintColors = []; @@ -1874,9 +1887,17 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ $skinData = new SkinData( $packet->clientData["SkinId"], base64_decode($packet->clientData["SkinResourcePatch"] ?? "", true), - new SkinImage($packet->clientData["SkinImageHeight"], $packet->clientData["SkinImageWidth"], base64_decode($packet->clientData["SkinData"], true)), + new SkinImage( + $packet->clientData["SkinImageHeight"], + $packet->clientData["SkinImageWidth"], + base64_decode($packet->clientData["SkinData"], true) + ), $animations, - new SkinImage($packet->clientData["CapeImageHeight"], $packet->clientData["CapeImageWidth"], base64_decode($packet->clientData["CapeData"] ?? "", true)), + new SkinImage( + $packet->clientData["CapeImageHeight"], + $packet->clientData["CapeImageWidth"], + base64_decode($packet->clientData["CapeData"] ?? "", true) + ), base64_decode($packet->clientData["SkinGeometryData"] ?? "", true), base64_decode($packet->clientData["SkinAnimationData"] ?? "", true), $packet->clientData["PremiumSkin"] ?? false,