Merge branch 'stable'

This commit is contained in:
Dylan K. Taylor 2019-06-22 20:26:21 +01:00
commit 3103579ba6

View File

@ -138,6 +138,9 @@ class StartGamePacket extends DataPacket implements ClientboundPacket{
/** @var string */ /** @var string */
public $multiplayerCorrelationId = ""; //TODO: this should be filled with a UUID of some sort public $multiplayerCorrelationId = ""; //TODO: this should be filled with a UUID of some sort
/** @var bool */
public $onlySpawnV1Villagers = false;
/** @var array|null each entry must have a "name" (string) and "data" (int16) element */ /** @var array|null each entry must have a "name" (string) and "data" (int16) element */
public $runtimeIdTable = null; public $runtimeIdTable = null;
@ -202,6 +205,7 @@ class StartGamePacket extends DataPacket implements ClientboundPacket{
$this->runtimeIdTable = $table; $this->runtimeIdTable = $table;
$this->multiplayerCorrelationId = $this->getString(); $this->multiplayerCorrelationId = $this->getString();
$this->onlySpawnV1Villagers = $this->getBool();
} }
protected function encodePayload() : void{ protected function encodePayload() : void{
@ -265,6 +269,7 @@ class StartGamePacket extends DataPacket implements ClientboundPacket{
} }
$this->putString($this->multiplayerCorrelationId); $this->putString($this->multiplayerCorrelationId);
$this->putBool($this->onlySpawnV1Villagers);
} }
private static function serializeBlockTable(array $table) : string{ private static function serializeBlockTable(array $table) : string{