mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-24 20:04:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.7'

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-04-06 15:35:58 +01:00
commit c310a0c50c
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,7 +363,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->getLevelData()->getGenerator()); $this->generator = GeneratorManager::getGenerator($this->provider->getLevelData()->getGenerator(), true);
//TODO: validate generator options //TODO: validate generator options
$this->folderName = $name; $this->folderName = $name;

9
src/pocketmine/level/LevelManager.php
View File

@ -33,6 +33,7 @@ use pocketmine\level\format\io\LevelProvider;
use pocketmine\level\format\io\LevelProviderManager; use pocketmine\level\format\io\LevelProviderManager;
use pocketmine\level\format\io\WritableLevelProvider; use pocketmine\level\format\io\WritableLevelProvider;
use pocketmine\level\generator\Generator; use pocketmine\level\generator\Generator;
use pocketmine\level\generator\GeneratorManager;
use pocketmine\level\generator\normal\Normal; use pocketmine\level\generator\normal\Normal;
use pocketmine\Server; use pocketmine\Server;
use pocketmine\timings\Timings; use pocketmine\timings\Timings;
@ -217,10 +218,16 @@ class LevelManager{
$providerClass = array_shift($providers); $providerClass = array_shift($providers);
/** /**
* @var LevelProvider * @var LevelProvider $provider
* @see LevelProvider::__construct() * @see LevelProvider::__construct()
*/ */
$provider = new $providerClass($path); $provider = new $providerClass($path);
try{
GeneratorManager::getGenerator($provider->getLevelData()->getGenerator(), true);
}catch(\InvalidArgumentException $e){
$this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.level.loadError", [$name, "Unknown generator \"" . $provider->getLevelData()->getGenerator() . "\""]));
return false;
}
if(!($provider instanceof WritableLevelProvider)){ if(!($provider instanceof WritableLevelProvider)){
if(!$autoUpgrade){ if(!$autoUpgrade){
throw new LevelException("World \"$name\" is in an unsupported format and needs to be upgraded"); throw new LevelException("World \"$name\" is in an unsupported format and needs to be upgraded");

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;
} }