mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-18 04:00:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' into next-minor

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-07-01 17:18:20 +01:00
parent 51f299f196 15fa1056b7
commit fab12707ae
5 changed files with 83 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/VersionInfo.php
View File

@@ -22,6 +22,6 @@
namespace pocketmine;
const NAME = "PocketMine-MP";
const BASE_VERSION = "3.8.5";
const BASE_VERSION = "3.8.6";
const IS_DEVELOPMENT_BUILD = true;
const BUILD_NUMBER = 0;

5
src/pocketmine/network/mcpe/protocol/StartGamePacket.php
View File

@@ -138,6 +138,9 @@ class StartGamePacket extends DataPacket{
/** @var string */
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 */
public $runtimeIdTable = null;
@@ -202,6 +205,7 @@ class StartGamePacket extends DataPacket{
$this->runtimeIdTable = $table;
$this->multiplayerCorrelationId = $this->getString();
$this->onlySpawnV1Villagers = $this->getBool();
}
protected function encodePayload(){
@@ -265,6 +269,7 @@ class StartGamePacket extends DataPacket{
}
$this->putString($this->multiplayerCorrelationId);
$this->putBool($this->onlySpawnV1Villagers);
}
private static function serializeBlockTable(array $table) : string{