mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-03 16:49:53 +00:00
Code Issues Projects Releases Wiki Activity

Added worlds directive to pocketmine.yml to load extra worlds or use a plugin-provided generator

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-08-01 12:24:08 +02:00
parent d10274ca7c
commit 26ec562fbf
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pocketmine/Server.php
View File

@ -1034,7 +1034,7 @@ class Server{
* *
* @return bool * @return bool
*/ */
public function generateLevel($name, $seed = null, $generator = null, array $options = []){ public function generateLevel($name, $seed = null, $generator = null, $options = []){
if(trim($name) === "" or $this->isLevelGenerated($name)){ if(trim($name) === "" or $this->isLevelGenerated($name)){
return false; return false;
} }
@ -1509,6 +1509,23 @@ class Server{
Generator::addGenerator("pocketmine\\level\\generator\\Normal", "normal"); Generator::addGenerator("pocketmine\\level\\generator\\Normal", "normal");
Generator::addGenerator("pocketmine\\level\\generator\\Normal", "default"); Generator::addGenerator("pocketmine\\level\\generator\\Normal", "default");
foreach($this->getProperty("worlds", []) as $name => $worldSetting){
if($this->loadLevel($name) === false){
$seed = $this->getProperty("worlds.$name.seed", time());
$options = explode(":", $this->getProperty("worlds.$name.generator", Generator::getGenerator("default")));
$generator = Generator::getGenerator(array_shift($options));
if(count($options) > 0){
$options = [
"preset" => implode(":", $options),
];
}else{
$options = [];
}
$this->generateLevel($name, $seed, $generator, $options);
}
}
if($this->getDefaultLevel() === null){ if($this->getDefaultLevel() === null){
$default = $this->getConfigString("level-name", "world"); $default = $this->getConfigString("level-name", "world");
if(trim($default) == ""){ if(trim($default) == ""){

4
src/pocketmine/level/generator/Generator.php
View File

@ -30,7 +30,7 @@ abstract class Generator{
private static $list = []; private static $list = [];
public static function addGenerator($object, $name){ public static function addGenerator($object, $name){
if(is_subclass_of($object, "pocketmine\\level\\generator\\Generator") and !isset(Generator::$list[$name])){ if(is_subclass_of($object, "pocketmine\\level\\generator\\Generator") and !isset(Generator::$list[$name = strtolower($name)])){
Generator::$list[$name] = $object; Generator::$list[$name] = $object;
return true; return true;
@ -40,7 +40,7 @@ abstract class Generator{
} }
public static function getGenerator($name){ public static function getGenerator($name){
if(isset(Generator::$list[$name])){ if(isset(Generator::$list[$name = strtolower($name)])){
return Generator::$list[$name]; return Generator::$list[$name];
} }

9
src/pocketmine/resources/pocketmine.yml
View File

@ -78,6 +78,13 @@ auto-updater:
host: www.pocketmine.net host: www.pocketmine.net
aliases: aliases:
#Examples #Examples:
#showtheversion: version #showtheversion: version
#savestop: [save-all, stop] #savestop: [save-all, stop]
worlds:
#These settings will override the generator set in server.properties and allows loading multiple levels
#Example:
#world:
# seed: 404
# generator: FLAT:2;7,59x1,3x3,2;1;decoration(treecount=80 grasscount=45)