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

LevelProvider: workaround bug fixed in b54197904d6c23c5babe2857d0107d9d0fc8bd68 for previously-affected worlds

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-06-07 15:18:42 +01:00
parent 083a1e1ff6
commit 0c70b83d81
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,8 @@ abstract class BaseLevelProvider implements LevelProvider{
protected function fixLevelData() : void{
if(!$this->levelData->hasTag("generatorName", StringTag::class)){
$this->levelData->setString("generatorName", "default", true);
}elseif(($generatorName = self::hackyFixForGeneratorClasspathInLevelDat($this->levelData->getString("generatorName"))) !== null){
$this->levelData->setString("generatorName", $generatorName);
}
if(!$this->levelData->hasTag("generatorOptions", StringTag::class)){
@ -68,6 +70,35 @@ abstract class BaseLevelProvider implements LevelProvider{
}
}
/**
* Hack to fix worlds broken previously by older versions of PocketMine-MP which incorrectly saved classpaths of
* generators into level.dat on imported (not generated) worlds.
*
* This should only have affected leveldb worlds as far as I know, because PC format worlds include the
* generatorName tag by default. However, MCPE leveldb ones didn't, and so they would get filled in with something
* broken.
*
* This bug took a long time to get found because previously the generator manager would just return the default
* generator silently on failure to identify the correct generator, which caused lots of unexpected bugs.
*
* Only classnames which were written into the level.dat from "fixing" the level data are included here. These are
* hardcoded to avoid problems fixing broken worlds in the future if these classes get moved, renamed or removed.
*
* @param string $className Classname saved in level.dat
*
* @return null|string Name of the correct generator to replace the broken value
*/
protected static function hackyFixForGeneratorClasspathInLevelDat(string $className) : ?string{
switch($className){
case 'pocketmine\level\generator\normal\Normal':
return "normal";
case 'pocketmine\level\generator\Flat':
return "flat";
}
return null;
}
public function getPath() : string{
return $this->path;
}

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

@ -142,6 +142,8 @@ class LevelDB extends BaseLevelProvider{
}else{
$this->levelData->setString("generatorName", "default");
}
}elseif(($generatorName = self::hackyFixForGeneratorClasspathInLevelDat($this->levelData->getString("generatorName"))) !== null){
$this->levelData->setString("generatorName", $generatorName);
}
if(!$this->levelData->hasTag("generatorOptions", StringTag::class)){