Merge branch 'release/3.1' into release/3.2

This commit is contained in:
Dylan K. Taylor 2018-08-11 19:59:53 +01:00
commit 39ed6a7cdf

View File

@ -40,7 +40,8 @@ class PlayerSkinPacket extends DataPacket{
public $newSkinName = "";
/** @var Skin */
public $skin;
/** @var bool */
public $premiumSkin = false;
protected function decodePayload(){
$this->uuid = $this->getUUID();
@ -54,6 +55,8 @@ class PlayerSkinPacket extends DataPacket{
$geometryData = $this->getString();
$this->skin = new Skin($skinId, $skinData, $capeData, $geometryModel, $geometryData);
$this->premiumSkin = $this->getBool();
}
protected function encodePayload(){
@ -66,6 +69,8 @@ class PlayerSkinPacket extends DataPacket{
$this->putString($this->skin->getCapeData());
$this->putString($this->skin->getGeometryName());
$this->putString($this->skin->getGeometryData());
$this->putBool($this->premiumSkin);
}
public function handle(NetworkSession $session) : bool{