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

Level: Stop unnecessarily initializing the generator on the main thread

Browse Source 
this is just slowing down startup times for no good reason.
This commit is contained in:
Dylan K. Taylor
2018-05-31 10:22:44 +01:00
parent 7fce48d38c
commit c493d0e6ac
5 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/level/generator/Generator.php
View File

@ -64,7 +64,7 @@ abstract class Generator{
/**
* @param $name
*
* @return Generator
* @return string|Generator Name of class that extends Generator (not an actual Generator object)
*/
public static function getGenerator($name){
if(isset(Generator::$list[$name = strtolower($name)])){

12
src/pocketmine/level/generator/GeneratorRegisterTask.php
View File

@ -32,15 +32,15 @@ use pocketmine\utils\Random;
class GeneratorRegisterTask extends AsyncTask{
public $generator;
public $generatorClass;
public $settings;
public $seed;
public $levelId;
public $worldHeight = Level::Y_MAX;
public function __construct(Level $level, Generator $generator){
$this->generator = get_class($generator);
$this->settings = serialize($generator->getSettings());
public function __construct(Level $level, string $generatorClass, array $generatorSettings = []){
$this->generatorClass = $generatorClass;
$this->settings = serialize($generatorSettings);
$this->seed = $level->getSeed();
$this->levelId = $level->getId();
$this->worldHeight = $level->getWorldHeight();
@ -51,9 +51,9 @@ class GeneratorRegisterTask extends AsyncTask{
Biome::init();
$manager = new SimpleChunkManager($this->seed, $this->worldHeight);
$this->saveToThreadStore("generation.level{$this->levelId}.manager", $manager);
/** @var Generator $generator */
$generator = $this->generator;
$generator = new $generator(unserialize($this->settings));
$generator = new $this->generatorClass(unserialize($this->settings));
$generator->init($manager, new Random($manager->getSeed()));
$this->saveToThreadStore("generation.level{$this->levelId}.generator", $generator);
}