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

PopulationTask: assume that generator has been initialized

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-12-13 20:00:57 +00:00
parent eaf6e19a6f
commit 1de5fc86c4
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/world/generator/PopulationTask.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\world\generator; namespace pocketmine\world\generator;
use pocketmine\scheduler\AsyncTask; use pocketmine\scheduler\AsyncTask;
use pocketmine\utils\AssumptionFailedError;
use pocketmine\world\format\Chunk; use pocketmine\world\format\Chunk;
use pocketmine\world\format\io\FastChunkSerializer; use pocketmine\world\format\io\FastChunkSerializer;
use pocketmine\world\SimpleChunkManager; use pocketmine\world\SimpleChunkManager;
@ -33,8 +34,6 @@ use function intdiv;
class PopulationTask extends AsyncTask{ class PopulationTask extends AsyncTask{
private const TLS_KEY_WORLD = "world"; private const TLS_KEY_WORLD = "world";
/** @var bool */
public $state;
/** @var int */ /** @var int */
public $worldId; public $worldId;
/** @var int */ /** @var int */
@ -66,7 +65,6 @@ class PopulationTask extends AsyncTask{
public $chunk8; public $chunk8;
public function __construct(World $world, int $chunkX, int $chunkZ, ?Chunk $chunk){ public function __construct(World $world, int $chunkX, int $chunkZ, ?Chunk $chunk){
$this->state = true;
$this->worldId = $world->getId(); $this->worldId = $world->getId();
$this->chunkX = $chunkX; $this->chunkX = $chunkX;
$this->chunkZ = $chunkZ; $this->chunkZ = $chunkZ;
@ -82,8 +80,7 @@ class PopulationTask extends AsyncTask{
public function onRun() : void{ public function onRun() : void{
$context = ThreadLocalGeneratorContext::fetch($this->worldId); $context = ThreadLocalGeneratorContext::fetch($this->worldId);
if($context === null){ if($context === null){
$this->state = false; throw new AssumptionFailedError("Generator context should have been initialized before any PopulationTask execution");
return;
} }
$generator = $context->getGenerator(); $generator = $context->getGenerator();
$manager = new SimpleChunkManager($context->getWorldHeight()); $manager = new SimpleChunkManager($context->getWorldHeight());
@ -140,10 +137,6 @@ class PopulationTask extends AsyncTask{
/** @var World $world */ /** @var World $world */
$world = $this->fetchLocal(self::TLS_KEY_WORLD); $world = $this->fetchLocal(self::TLS_KEY_WORLD);
if(!$world->isClosed()){ if(!$world->isClosed()){
if(!$this->state){
$world->registerGeneratorToWorker($this->worker->getAsyncWorkerId());
}
$chunk = $this->chunk !== null ? FastChunkSerializer::deserialize($this->chunk) : null; $chunk = $this->chunk !== null ? FastChunkSerializer::deserialize($this->chunk) : null;
for($i = 0; $i < 9; ++$i){ for($i = 0; $i < 9; ++$i){
@ -156,11 +149,11 @@ class PopulationTask extends AsyncTask{
$zz = -1 + intdiv($i, 3); $zz = -1 + intdiv($i, 3);
$c = FastChunkSerializer::deserialize($c); $c = FastChunkSerializer::deserialize($c);
$world->generateChunkCallback($this->chunkX + $xx, $this->chunkZ + $zz, $this->state ? $c : null); $world->generateChunkCallback($this->chunkX + $xx, $this->chunkZ + $zz, $c);
} }
} }
$world->generateChunkCallback($this->chunkX, $this->chunkZ, $this->state ? $chunk : null); $world->generateChunkCallback($this->chunkX, $this->chunkZ, $chunk);
} }
} }
} }