mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 02:08:21 +00:00
Code Issues Projects Releases Wiki Activity

New generic in-memory chunk format, fixed 0.17.0.1 chunk loading

Browse Source 
Terrible performance, needs profiling. TODO: fix this.
This commit is contained in:
Dylan K. Taylor
2016-11-17 16:15:06 +00:00
parent 60260a294b
commit 4c49db6036
44 changed files with 1895 additions and 2812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,8 @@
namespace pocketmine\level\generator;
use pocketmine\level\format\FullChunk;
use pocketmine\level\format\Chunk;
use pocketmine\level\format\generic\GenericChunk;
use pocketmine\level\Level;
use pocketmine\level\SimpleChunkManager;
use pocketmine\scheduler\AsyncTask;
@ -34,10 +35,10 @@ class GenerationTask extends AsyncTask{
public $chunk;
public $chunkClass;
public function __construct(Level $level, FullChunk $chunk){
public function __construct(Level $level, Chunk $chunk){
$this->state = true;
$this->levelId = $level->getId();
$this->chunk = $chunk->toFastBinary();
$this->chunk = GenericChunk::fastSerialize($chunk);
$this->chunkClass = get_class($chunk);
}
@ -51,9 +52,9 @@ class GenerationTask extends AsyncTask{
return;
}
/** @var FullChunk $chunk */
/** @var Chunk $chunk */
$chunk = $this->chunkClass;
$chunk = $chunk::fromFastBinary($this->chunk);
$chunk = GenericChunk::fastDeserialize($this->chunk);
if($chunk === null){
//TODO error
return;
@ -65,7 +66,7 @@ class GenerationTask extends AsyncTask{
$chunk = $manager->getChunk($chunk->getX(), $chunk->getZ());
$chunk->setGenerated();
$this->chunk = $chunk->toFastBinary();
$this->chunk = GenericChunk::fastSerialize($chunk);
$manager->setChunk($chunk->getX(), $chunk->getZ(), null);
}
@ -77,9 +78,9 @@ class GenerationTask extends AsyncTask{
$level->registerGenerator();
return;
}
/** @var FullChunk $chunk */
/** @var Chunk $chunk */
$chunk = $this->chunkClass;
$chunk = $chunk::fromFastBinary($this->chunk, $level->getProvider());
$chunk = GenericChunk::fastDeserialize($this->chunk, $level->getProvider());
if($chunk === null){
//TODO error
return;