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

Merge branch 'stable'

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-02-24 22:11:13 +00:00
parent e279672d45 04581e2700
commit bd00ee5038
6 changed files with 113 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/mcpe/serializer/NetworkBinaryStream.php
View File

@ -117,7 +117,7 @@ class NetworkBinaryStream extends BinaryStream{
$capeId = $this->getString();
$fullSkinId = $this->getString();
return new SkinData($skinId, $skinResourcePatch, $skinData, $animations, $capeData, $geometryData, $animationData, $premium, $persona, $capeOnClassic, $capeId);
return new SkinData($skinId, $skinResourcePatch, $skinData, $animations, $capeData, $geometryData, $animationData, $premium, $persona, $capeOnClassic, $capeId, $fullSkinId);
}
public function putSkin(SkinData $skin): void{
@ -137,9 +137,7 @@ class NetworkBinaryStream extends BinaryStream{
$this->putBool($skin->isPersona());
$this->putBool($skin->isPersonaCapeOnClassic());
$this->putString($skin->getCapeId());
//this has to be unique or the client will do stupid things
$this->putString(UUID::fromRandom()->toString()); //full skin ID
$this->putString($skin->getFullSkinId());
}
private function getSkinImage() : SkinImage{