mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-29 22:25:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'php/7.0'

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-09-04 10:01:47 +01:00
commit 6877ac35eb
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pocketmine/PocketMine.php
View File

@ -459,6 +459,7 @@ namespace pocketmine {
} }
$extensions = [ $extensions = [
"bcmath" => "BC Math",
"curl" => "cURL", "curl" => "cURL",
"json" => "JSON", "json" => "JSON",
"mbstring" => "Multibyte String", "mbstring" => "Multibyte String",

6
src/pocketmine/Server.php
View File

@ -1639,6 +1639,12 @@ class Server{
foreach((array) $this->getProperty("worlds", []) as $name => $worldSetting){ foreach((array) $this->getProperty("worlds", []) as $name => $worldSetting){
if($this->loadLevel($name) === false){ if($this->loadLevel($name) === false){
$seed = $this->getProperty("worlds.$name.seed", time()); $seed = $this->getProperty("worlds.$name.seed", time());
if(is_string($seed) and !is_numeric($seed)){
$seed = Utils::javaStringHash($seed);
}elseif(!is_int($seed)){
$seed = (int) $seed;
}
$options = explode(":", $this->getProperty("worlds.$name.generator", Generator::getGenerator("default"))); $options = explode(":", $this->getProperty("worlds.$name.generator", Generator::getGenerator("default")));
$generator = Generator::getGenerator(array_shift($options)); $generator = Generator::getGenerator(array_shift($options));
if(count($options) > 0){ if(count($options) > 0){

2
src/raklib

@ -1 +1 @@
Subproject commit 226772184b6cb3c014477feb41e55ec22850f2dd Subproject commit 97d2faf6928014ff953922d030f67b1e8b046dd7