From 1a99938e4b5af0295e449379dbdb0a3ffe703efd Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 9 Dec 2019 18:26:20 +0000 Subject: [PATCH] LegacySkinAdapter: clean up nonsensical code ordering --- .../mcpe/protocol/types/LegacySkinAdapter.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php b/src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php index e503ee825..639e1adcf 100644 --- a/src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php +++ b/src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php @@ -47,7 +47,12 @@ class LegacySkinAdapter implements SkinAdapter{ } public function fromSkinData(SkinData $data) : Skin{ - $capeData = $data->getCapeImage()->getData(); + if($data->isPersona()){ + return new Skin("Standard_Custom", str_repeat(random_bytes(3) . "\xff", 2048)); + } + + $capeData = $data->isPersonaCapeOnClassic() ? "" : $data->getCapeImage()->getData(); + $geometryName = ""; $resourcePatch = json_decode($data->getResourcePatch(), true); if(is_array($resourcePatch["geometry"]) && is_string($resourcePatch["geometry"]["default"])){ @@ -55,11 +60,7 @@ class LegacySkinAdapter implements SkinAdapter{ }else{ //TODO: Kick for invalid skin } - if($data->isPersona()){ - return new Skin("Standard_Custom", str_repeat(random_bytes(3) . "\xff", 2048)); - }elseif($data->isPersonaCapeOnClassic()){ - $capeData = ""; - } + return new Skin($data->getSkinId(), $data->getSkinImage()->getData(), $capeData, $geometryName, $data->getGeometryData()); } }