mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-23 19:34:15 +00:00
Code Issues Projects Releases Wiki Activity

Server: do not attempt to generate a new world if it already exists

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-10-11 17:48:08 +01:00
parent 8fd475f87b
commit 01c0602043
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Server.php
View File

@ -992,7 +992,7 @@ class Server{
}elseif(!is_array($options)){ }elseif(!is_array($options)){
continue; continue;
} }
if(!$this->worldManager->loadWorld($name, true)){ if(!$this->worldManager->loadWorld($name, true) && !$this->worldManager->isWorldGenerated($name)){
$creationOptions = WorldCreationOptions::create(); $creationOptions = WorldCreationOptions::create();
//TODO: error checking //TODO: error checking
@ -1028,7 +1028,7 @@ class Server{
$default = "world"; $default = "world";
$this->configGroup->setConfigString("level-name", "world"); $this->configGroup->setConfigString("level-name", "world");
} }
if(!$this->worldManager->loadWorld($default, true)){ if(!$this->worldManager->loadWorld($default, true) && !$this->worldManager->isWorldGenerated($default)){
$generatorName = $this->configGroup->getConfigString("level-type"); $generatorName = $this->configGroup->getConfigString("level-type");
$generatorOptions = $this->configGroup->getConfigString("generator-settings"); $generatorOptions = $this->configGroup->getConfigString("generator-settings");
$generatorClass = $getGenerator($generatorName, $generatorOptions, $default); $generatorClass = $getGenerator($generatorName, $generatorOptions, $default);