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

Fixed imported worlds getting PM classpaths written into their level.dat for generator

Browse Source 
This will not fix existing worlds affected by this bug.
This commit is contained in:
Dylan K. Taylor 2018-06-07 13:20:50 +01:00
parent fb484087a8
commit b54197904d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/level/format/io/BaseLevelProvider.php
View File

@ -60,7 +60,7 @@ abstract class BaseLevelProvider implements LevelProvider{
protected function fixLevelData() : void{ protected function fixLevelData() : void{
if(!$this->levelData->hasTag("generatorName", StringTag::class)){ if(!$this->levelData->hasTag("generatorName", StringTag::class)){
$this->levelData->setString("generatorName", Generator::getGenerator("DEFAULT"), true); $this->levelData->setString("generatorName", "default", true);
} }
if(!$this->levelData->hasTag("generatorOptions", StringTag::class)){ if(!$this->levelData->hasTag("generatorOptions", StringTag::class)){

6
src/pocketmine/level/format/io/leveldb/LevelDB.php
View File

@ -121,7 +121,7 @@ class LevelDB extends BaseLevelProvider{
if($this->levelData->hasTag("Generator", IntTag::class)){ if($this->levelData->hasTag("Generator", IntTag::class)){
switch($this->levelData->getInt("Generator")){ //Detect correct generator from MCPE data switch($this->levelData->getInt("Generator")){ //Detect correct generator from MCPE data
case self::GENERATOR_FLAT: case self::GENERATOR_FLAT:
$this->levelData->setString("generatorName", Generator::getGenerator("FLAT")); $this->levelData->setString("generatorName", "flat");
if(($layers = $db->get(self::ENTRY_FLAT_WORLD_LAYERS)) !== false){ //Detect existing custom flat layers if(($layers = $db->get(self::ENTRY_FLAT_WORLD_LAYERS)) !== false){ //Detect existing custom flat layers
$layers = trim($layers, "[]"); $layers = trim($layers, "[]");
}else{ }else{
@ -131,7 +131,7 @@ class LevelDB extends BaseLevelProvider{
break; break;
case self::GENERATOR_INFINITE: case self::GENERATOR_INFINITE:
//TODO: add a null generator which does not generate missing chunks (to allow importing back to MCPE and generating more normal terrain without PocketMine messing things up) //TODO: add a null generator which does not generate missing chunks (to allow importing back to MCPE and generating more normal terrain without PocketMine messing things up)
$this->levelData->setString("generatorName", Generator::getGenerator("DEFAULT")); $this->levelData->setString("generatorName", "default");
$this->levelData->setString("generatorOptions", ""); $this->levelData->setString("generatorOptions", "");
break; break;
case self::GENERATOR_LIMITED: case self::GENERATOR_LIMITED:
@ -140,7 +140,7 @@ class LevelDB extends BaseLevelProvider{
throw new LevelException("Unknown LevelDB world format type, this level cannot be loaded"); throw new LevelException("Unknown LevelDB world format type, this level cannot be loaded");
} }
}else{ }else{
$this->levelData->setString("generatorName", Generator::getGenerator("DEFAULT")); $this->levelData->setString("generatorName", "default");
} }
} }