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

Refactor GenericChunk::fastSerialize() to be non-static, fix some unbelievable bugs, clean up some leftovers

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-01-04 21:13:42 +00:00
parent 598e7aac8f
commit d8908676ac
6 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/level/format/Chunk.php
View File

@ -363,13 +363,11 @@ interface Chunk{
public function networkSerialize() : string;
/**
* Serializes a chunk without compression for use in AsyncTasks.
*
* @param Chunk $chunk
* Serializes the chunk without compression for use in AsyncTasks.
*
* @return string
*/
public static function fastSerialize(Chunk $chunk) : string;
public function fastSerialize() : string;
/**
* Deserializes a chunk from fast serialization

3
src/pocketmine/level/format/generic/ChunkRequestTask.php
View File

@ -21,6 +21,7 @@
namespace pocketmine\level\format\generic;
use pocketmine\level\format\Chunk;
use pocketmine\level\Level;
use pocketmine\nbt\NBT;
use pocketmine\scheduler\AsyncTask;
@ -40,7 +41,7 @@ class ChunkRequestTask extends AsyncTask{
public function __construct(Level $level, Chunk $chunk){
$this->levelId = $level->getId();
$this->chunk = GenericChunk::fastSerialize($chunk);
$this->chunk = $chunk->fastSerialize();
$this->chunkX = $chunk->getX();
$this->chunkZ = $chunk->getZ();

14
src/pocketmine/level/format/generic/GenericChunk.php
View File

@ -621,13 +621,13 @@ class GenericChunk implements Chunk{
return $result;
}
public static function fastSerialize(Chunk $chunk) : string{
public function fastSerialize() : string{
$stream = new BinaryStream();
$stream->putInt($chunk->x);
$stream->putInt($chunk->z);
$stream->putInt($this->x);
$stream->putInt($this->z);
$count = 0;
$subChunks = "";
foreach($chunk->subChunks as $y => $subChunk){
foreach($this->subChunks as $y => $subChunk){
if($subChunk instanceof EmptySubChunk){
continue;
}
@ -636,9 +636,9 @@ class GenericChunk implements Chunk{
}
$stream->putByte($count);
$stream->put($subChunks);
$stream->put(pack("C*", ...$chunk->getHeightMapArray()) .
$chunk->getBiomeIdArray() .
chr(($chunk->lightPopulated ? 1 << 2 : 0) | ($chunk->terrainPopulated ? 1 << 1 : 0) | ($chunk->terrainGenerated ? 1 : 0)));
$stream->put(pack("C*", ...$this->heightMap) .
$this->biomeIds .
chr(($this->lightPopulated ? 1 << 2 : 0) | ($this->terrainPopulated ? 1 << 1 : 0) | ($this->terrainGenerated ? 1 : 0)));
//TODO: tiles and entities
return $stream->getBuffer();
}