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

Fixed worlds with unknown generators silently getting wrong generator, closes #2860

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-04-06 15:17:36 +01:00
parent fdc3faadc9
commit 612e9e162c
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/Server.php
View File

@ -1091,9 +1091,19 @@ class Server{
return false; return false;
} }
/**
* @var LevelProvider $provider
* @see LevelProvider::__construct()
*/
$provider = new $providerClass($path);
try{
GeneratorManager::getGenerator($provider->getGenerator(), true);
}catch(\InvalidArgumentException $e){
$this->logger->error($this->getLanguage()->translateString("pocketmine.level.loadError", [$name, "Unknown generator \"" . $provider->getGenerator() . "\""]));
return false;
}
/** @see LevelProvider::__construct() */ $level = new Level($this, $name, $provider);
$level = new Level($this, $name, new $providerClass($path));
$this->levels[$level->getId()] = $level; $this->levels[$level->getId()] = $level;

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

@ -383,7 +383,7 @@ class Level implements ChunkManager, Metadatable{
$this->worldHeight = $this->provider->getWorldHeight(); $this->worldHeight = $this->provider->getWorldHeight();
$this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.level.preparing", [$this->displayName])); $this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.level.preparing", [$this->displayName]));
$this->generator = GeneratorManager::getGenerator($this->provider->getGenerator()); $this->generator = GeneratorManager::getGenerator($this->provider->getGenerator(), true);
//TODO: validate generator options //TODO: validate generator options
$this->folderName = $name; $this->folderName = $name;

7
src/pocketmine/level/generator/GeneratorManager.php
View File

@ -74,14 +74,19 @@ final class GeneratorManager{
* Returns a class name of a registered Generator matching the given name. * Returns a class name of a registered Generator matching the given name.
* *
* @param string $name * @param string $name
* @param bool $throwOnMissing @deprecated this is for backwards compatibility only
* *
* @return string|Generator Name of class that extends Generator (not an actual Generator object) * @return string|Generator Name of class that extends Generator (not an actual Generator object)
* @throws \InvalidArgumentException if the generator type isn't registered
*/ */
public static function getGenerator(string $name){ public static function getGenerator(string $name, bool $throwOnMissing = false){
if(isset(self::$list[$name = strtolower($name)])){ if(isset(self::$list[$name = strtolower($name)])){
return self::$list[$name]; return self::$list[$name];
} }
if($throwOnMissing){
throw new \InvalidArgumentException("Alias \"$name\" does not map to any known generator");
}
return Normal::class; return Normal::class;
} }