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

Generator: Moved generator registering things to a separate GeneratorManager class

Browse Source 
this isolates the concerns of the Generator class, and also removes cyclic dependencies between the Generator class and its descendents.
This commit is contained in:
Dylan K. Taylor
2018-06-07 13:48:01 +01:00
parent 0bca3cd481
commit 5eec683110
6 changed files with 95 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pocketmine/Server.php
View File

@ -51,6 +51,7 @@ use pocketmine\level\biome\Biome;
use pocketmine\level\format\io\LevelProvider;
use pocketmine\level\format\io\LevelProviderManager;
use pocketmine\level\generator\Generator;
use pocketmine\level\generator\GeneratorManager;
use pocketmine\level\Level;
use pocketmine\level\LevelException;
use pocketmine\metadata\EntityMetadataStore;
@ -1074,7 +1075,7 @@ class Server{
}
if(!($generator !== null and class_exists($generator, true) and is_subclass_of($generator, Generator::class))){
$generator = Generator::getGenerator($this->getLevelType());
$generator = GeneratorManager::getGenerator($this->getLevelType());
}
if(($providerClass = LevelProviderManager::getProviderByName($this->getProperty("level-settings.default-format", "pmanvil"))) === null){
@ -1662,7 +1663,7 @@ class Server{
$this->logger->debug($this->getLanguage()->translateString("pocketmine.debug.enable"));
}
Generator::registerDefaultGenerators();
GeneratorManager::registerDefaultGenerators();
foreach((array) $this->getProperty("worlds", []) as $name => $options){
if(!is_array($options)){
@ -1678,12 +1679,12 @@ class Server{
if(isset($options["generator"])){
$generatorOptions = explode(":", $options["generator"]);
$generator = Generator::getGenerator(array_shift($generatorOptions));
$generator = GeneratorManager::getGenerator(array_shift($generatorOptions));
if(count($options) > 0){
$options["preset"] = implode(":", $generatorOptions);
}
}else{
$generator = Generator::getGenerator("default");
$generator = GeneratorManager::getGenerator("default");
}
$this->generateLevel($name, $seed, $generator, $options);