Merge branch '3.5'

This commit is contained in:
Dylan K. Taylor 2019-01-10 19:31:01 +00:00
commit f4d07f0c1e

View File

@ -1740,7 +1740,9 @@ class Server{
GeneratorManager::registerDefaultGenerators();
foreach((array) $this->getProperty("worlds", []) as $name => $options){
if(!is_array($options)){
if($options === null){
$options = [];
}elseif(!is_array($options)){
continue;
}
if(!$this->loadLevel($name)){