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

Merge branch 'master' into scheduler-nuke

Browse Source 
# Conflicts:
#	src/pocketmine/level/Level.php
This commit is contained in:
Dylan K. Taylor
2018-05-31 10:40:10 +01:00
parent b3043f9552 1b4723d816
commit 05ef13b23a
6 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pocketmine/level/Level.php
View File

@ -239,10 +239,8 @@ class Level implements ChunkManager, Metadatable{
/** @var int */
public $tickRateCounter = 0;
/** @var Generator */
/** @var string|Generator */
private $generator;
/** @var Generator */
private $generatorInstance;
/** @var bool */
private $closed = false;
@ -379,17 +377,14 @@ class Level implements ChunkManager, Metadatable{
}
public function initLevel(){
$generator = $this->generator;
$this->generatorInstance = new $generator($this->provider->getGeneratorOptions());
$this->generatorInstance->init($this, new Random($this->getSeed()));
$this->registerGenerator();
}
public function registerGenerator(){
$pool = $this->server->getAsyncPool();
for($i = 0, $size = $pool->getSize(); $i < $size; ++$i){
$pool->submitTaskToWorker(new GeneratorRegisterTask($this, $this->generatorInstance), $i);
$pool->submitTaskToWorker(new GeneratorRegisterTask($this, $this->generator, $this->provider->getGeneratorOptions()), $i);
}
}