mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-24 11:54:23 +00:00
Code Issues Projects Releases Wiki Activity

PopulationTask: clean up overcomplicated garbage

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-02-05 18:31:51 +00:00
parent 4572ec8175
commit 262728b091
1 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,48 +102,26 @@ class PopulationTask extends AsyncTask{
} }
foreach($chunks as $c){ foreach($chunks as $c){
if($c !== null){ $manager->setChunk($c->getX(), $c->getZ(), $c);
$manager->setChunk($c->getX(), $c->getZ(), $c); if(!$c->isGenerated()){
if(!$c->isGenerated()){ $generator->generateChunk($c->getX(), $c->getZ());
$generator->generateChunk($c->getX(), $c->getZ()); $c->setGenerated();
$c = $manager->getChunk($c->getX(), $c->getZ());
$c->setGenerated();
}
} }
} }
$generator->populateChunk($chunk->getX(), $chunk->getZ()); $generator->populateChunk($chunk->getX(), $chunk->getZ());
$chunk = $manager->getChunk($chunk->getX(), $chunk->getZ());
$chunk->recalculateHeightMap(); $chunk->recalculateHeightMap();
$chunk->populateSkyLight(); $chunk->populateSkyLight();
$chunk->setLightPopulated(); $chunk->setLightPopulated();
$chunk->setPopulated(); $chunk->setPopulated();
$this->chunk = $chunk->fastSerialize(); $this->chunk = $chunk->fastSerialize();
$manager->setChunk($chunk->getX(), $chunk->getZ(), null);
foreach($chunks as $i => $c){ foreach($chunks as $i => $c){
if($c !== null){ $this->{"chunk$i"} = $c->hasChanged() ? $c->fastSerialize() : null;
$c = $chunks[$i] = $manager->getChunk($c->getX(), $c->getZ());
if(!$c->hasChanged()){
$chunks[$i] = null;
}
}else{
//This way non-changed chunks are not set
$chunks[$i] = null;
}
} }
$manager->cleanChunks(); $manager->cleanChunks();
for($i = 0; $i < 9; ++$i){
if($i === 4){
continue;
}
$this->{"chunk$i"} = $chunks[$i] !== null ? $chunks[$i]->fastSerialize() : null;
}
} }
public function onCompletion(Server $server){ public function onCompletion(Server $server){