Merge branch 'master' into mcpe-0.11

This commit is contained in:
Shoghi Cervantes
2015-03-19 09:18:39 +01:00
32 changed files with 203 additions and 390 deletions

View File

@@ -1142,7 +1142,7 @@ class Server{
$seed = $seed === null ? Binary::readInt(@Utils::getRandomBytes(4, false)) : (int) $seed;
if(!isset($options["presey"])){
if(!isset($options["preset"])){
$options["preset"] = $this->getConfigString("generator-settings", "");
}