mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-06 11:57:10 +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
Show Stats 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; continue;
} }
if(!$this->loadLevel($name)){ 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"])){ if(isset($options["generator"])){
$generatorOptions = explode(":", $options["generator"]); $generatorOptions = explode(":", $options["generator"]);
$generator = GeneratorManager::getGenerator(array_shift($generatorOptions)); $generator = GeneratorManager::getGenerator(array_shift($generatorOptions));
@ -1687,7 +1680,7 @@ class Server{
$generator = GeneratorManager::getGenerator("default"); $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"); $this->setConfigString("level-name", "world");
} }
if(!$this->loadLevel($default)){ if(!$this->loadLevel($default)){
$seed = $this->getConfigString("level-seed", (string) time()); $this->generateLevel($default, Generator::convertSeed($this->getConfigString("level-seed")));
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->setDefaultLevel($this->getLevelByName($default)); $this->setDefaultLevel($this->getLevelByName($default));

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

@ -29,11 +29,32 @@ namespace pocketmine\level\generator;
use pocketmine\level\ChunkManager; use pocketmine\level\ChunkManager;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\utils\Random; use pocketmine\utils\Random;
use pocketmine\utils\Utils;
abstract class Generator{ abstract class Generator{
/**
* Converts a string level seed into an integer for use by the generator.
*
* @param string $seed
*
* @return int|null
*/
public static function convertSeed(string $seed) : ?int{
if($seed === ""){ //empty seed should cause a random seed to be selected - can't use 0 here because 0 is a valid seed
$convertedSeed = null;
}elseif(ctype_digit($seed)){ //this avoids treating seeds like "404.4" as integer seeds
$convertedSeed = (int) $seed;
}else{
$convertedSeed = Utils::javaStringHash($seed);
}
return $convertedSeed;
}
abstract public function __construct(array $settings = []); abstract public function __construct(array $settings = []);
abstract public function init(ChunkManager $level, Random $random); abstract public function init(ChunkManager $level, Random $random);
abstract public function generateChunk(int $chunkX, int $chunkZ); abstract public function generateChunk(int $chunkX, int $chunkZ);