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

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

View File

@ -1091,9 +1091,19 @@ class Server{
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, new $providerClass($path));
$level = new Level($this, $name, $provider);
$this->levels[$level->getId()] = $level;