mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 09:56:06 +00:00
Code Issues Projects Releases Wiki Activity

Cleaned up level seed handling

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-06-07 19:39:24 +01:00
parent 3707a41b67
commit 996935e9b2
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/pocketmine/Server.php
View File

@ -1670,13 +1670,6 @@ class Server{
continue;
}
if(!$this->loadLevel($name)){
$seed = $options["seed"] ?? time();
if(is_string($seed) and !is_numeric($seed)){
$seed = Utils::javaStringHash($seed);
}elseif(!is_int($seed)){
$seed = (int) $seed;
}
if(isset($options["generator"])){
$generatorOptions = explode(":", $options["generator"]);
$generator = GeneratorManager::getGenerator(array_shift($generatorOptions));
@ -1687,7 +1680,7 @@ class Server{
$generator = GeneratorManager::getGenerator("default");
}
$this->generateLevel($name, $seed, $generator, $options);
$this->generateLevel($name, Generator::convertSeed((string) ($options["seed"] ?? "")), $generator, $options);
}
}
@ -1699,13 +1692,7 @@ class Server{
$this->setConfigString("level-name", "world");
}
if(!$this->loadLevel($default)){
$seed = $this->getConfigString("level-seed", (string) time());
if(!is_numeric($seed) or bccomp($seed, "9223372036854775807") > 0){
$seed = Utils::javaStringHash($seed);
}else{
$seed = (int) $seed;
}
$this->generateLevel($default, $seed === 0 ? time() : $seed);
$this->generateLevel($default, Generator::convertSeed($this->getConfigString("level-seed")));
}
$this->setDefaultLevel($this->getLevelByName($default));