mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 00:33:59 +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
Show Stats 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();
}

6
src/pocketmine/level/generator/GenerationTask.php
View File

@ -33,13 +33,11 @@ class GenerationTask extends AsyncTask{
public $state;
public $levelId;
public $chunk;
public $chunkClass;
public function __construct(Level $level, Chunk $chunk){
$this->state = true;
$this->levelId = $level->getId();
$this->chunk = GenericChunk::fastSerialize($chunk);
$this->chunkClass = get_class($chunk);
$this->chunk = $chunk->fastSerialize();
}
public function onRun(){
@ -65,7 +63,7 @@ class GenerationTask extends AsyncTask{
$chunk = $manager->getChunk($chunk->getX(), $chunk->getZ());
$chunk->setGenerated();
$this->chunk = GenericChunk::fastSerialize($chunk);
$this->chunk = $chunk->fastSerialize();
$manager->setChunk($chunk->getX(), $chunk->getZ(), null);
}

6
src/pocketmine/level/generator/LightPopulationTask.php
View File

@ -31,12 +31,10 @@ class LightPopulationTask extends AsyncTask{
public $levelId;
public $chunk;
public $chunkClass;
public function __construct(Level $level, Chunk $chunk){
$this->levelId = $level->getId();
$this->chunk = GenericChunk::fastDeserialize($this->chunk);
$this->chunkClass = get_class($chunk);
$this->chunk = $chunk->fastSerialize();
}
public function onRun(){
@ -51,7 +49,7 @@ class LightPopulationTask extends AsyncTask{
$chunk->populateSkyLight();
$chunk->setLightPopulated();
$this->chunk = GenericChunk::fastSerialize($chunk);
$this->chunk = $chunk->fastSerialize();
}
public function onCompletion(Server $server){

8
src/pocketmine/level/generator/PopulationTask.php
View File

@ -47,7 +47,7 @@ class PopulationTask extends AsyncTask{
public function __construct(Level $level, Chunk $chunk){
$this->state = true;
$this->levelId = $level->getId();
$this->chunk = GenericChunk::fastSerialize($chunk);
$this->chunk = $chunk->fastSerialize();
for($i = 0; $i < 9; ++$i){
if($i === 4){
@ -56,7 +56,7 @@ class PopulationTask extends AsyncTask{
$xx = -1 + $i % 3;
$zz = -1 + (int) ($i / 3);
$ck = $level->getChunk($chunk->getX() + $xx, $chunk->getZ() + $zz, false);
$this->{"chunk$i"} = $ck !== null ? GenericChunk::fastSerialize($ck) : null;
$this->{"chunk$i"} = $ck !== null ? $ck->fastSerialize() : null;
}
}
@ -118,7 +118,7 @@ class PopulationTask extends AsyncTask{
$chunk->populateSkyLight();
$chunk->setLightPopulated();
$chunk->setPopulated();
$this->chunk = GenericChunk::fastSerialize($chunk);
$this->chunk = $chunk->fastSerialize();
$manager->setChunk($chunk->getX(), $chunk->getZ(), null);
@ -141,7 +141,7 @@ class PopulationTask extends AsyncTask{
continue;
}
$this->{"chunk$i"} = $chunks[$i] !== null ? GenericChunk::fastSerialize($chunks[$i]) : null;
$this->{"chunk$i"} = $chunks[$i] !== null ? $chunks[$i]->fastSerialize() : null;
}
}