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

Minor cleanup to LevelDB constructor

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-03-11 18:15:20 +00:00
parent b8064aa45c
commit d478661961
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,12 @@ abstract class BaseLevelProvider implements LevelProvider{
if(!file_exists($this->path)){ if(!file_exists($this->path)){
mkdir($this->path, 0777, true); mkdir($this->path, 0777, true);
} }
$this->loadLevelData();
$this->fixLevelData();
}
protected function loadLevelData() : void{
$nbt = new BigEndianNBTStream(); $nbt = new BigEndianNBTStream();
$levelData = $nbt->readCompressed(file_get_contents($this->getPath() . "level.dat")); $levelData = $nbt->readCompressed(file_get_contents($this->getPath() . "level.dat"));
@ -50,7 +56,9 @@ abstract class BaseLevelProvider implements LevelProvider{
} }
$this->levelData = $levelData->getCompoundTag("Data"); $this->levelData = $levelData->getCompoundTag("Data");
}
protected function fixLevelData() : void{
if(!$this->levelData->hasTag("generatorName", StringTag::class)){ if(!$this->levelData->hasTag("generatorName", StringTag::class)){
$this->levelData->setString("generatorName", (string) Generator::getGenerator("DEFAULT"), true); $this->levelData->setString("generatorName", (string) Generator::getGenerator("DEFAULT"), true);
} }

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

@ -86,13 +86,20 @@ class LevelDB extends BaseLevelProvider{
} }
} }
private static function createDB(string $path) : \LevelDB{
return new \LevelDB($path . "/db", [
"compression" => LEVELDB_ZLIB_RAW_COMPRESSION
]);
}
public function __construct(string $path){ public function __construct(string $path){
self::checkForLevelDBExtension(); self::checkForLevelDBExtension();
parent::__construct($path);
$this->path = $path; $this->db = self::createDB($path);
if(!file_exists($this->path)){
mkdir($this->path, 0777, true);
} }
protected function loadLevelData() : void{
$nbt = new LittleEndianNBTStream(); $nbt = new LittleEndianNBTStream();
$levelData = $nbt->read(substr(file_get_contents($this->getPath() . "level.dat"), 8)); $levelData = $nbt->read(substr(file_get_contents($this->getPath() . "level.dat"), 8));
if($levelData instanceof CompoundTag){ if($levelData instanceof CompoundTag){
@ -101,21 +108,21 @@ class LevelDB extends BaseLevelProvider{
throw new LevelException("Invalid level.dat"); throw new LevelException("Invalid level.dat");
} }
$this->db = new \LevelDB($this->path . "/db", [
"compression" => LEVELDB_ZLIB_RAW_COMPRESSION
]);
$version = $this->levelData->getInt("StorageVersion", INT32_MAX, true); $version = $this->levelData->getInt("StorageVersion", INT32_MAX, true);
if($version > self::CURRENT_STORAGE_VERSION){ if($version > self::CURRENT_STORAGE_VERSION){
throw new LevelException("Specified LevelDB world format version ($version) is not supported by " . \pocketmine\NAME); throw new LevelException("Specified LevelDB world format version ($version) is not supported by " . \pocketmine\NAME);
} }
}
protected function fixLevelData() : void{
$db = self::createDB($this->path);
if(!$this->levelData->hasTag("generatorName", StringTag::class)){ if(!$this->levelData->hasTag("generatorName", StringTag::class)){
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", (string) Generator::getGenerator("FLAT")); $this->levelData->setString("generatorName", (string) Generator::getGenerator("FLAT"));
if(($layers = $this->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{
$layers = "7,3,3,2"; $layers = "7,3,3,2";
@ -140,6 +147,8 @@ class LevelDB extends BaseLevelProvider{
if(!$this->levelData->hasTag("generatorOptions", StringTag::class)){ if(!$this->levelData->hasTag("generatorOptions", StringTag::class)){
$this->levelData->setString("generatorOptions", ""); $this->levelData->setString("generatorOptions", "");
} }
$db->close();
} }
public static function getProviderName() : string{ public static function getProviderName() : string{
@ -212,9 +221,7 @@ class LevelDB extends BaseLevelProvider{
file_put_contents($path . "level.dat", Binary::writeLInt(self::CURRENT_STORAGE_VERSION) . Binary::writeLInt(strlen($buffer)) . $buffer); file_put_contents($path . "level.dat", Binary::writeLInt(self::CURRENT_STORAGE_VERSION) . Binary::writeLInt(strlen($buffer)) . $buffer);
$db = new \LevelDB($path . "/db", [ $db = self::createDB($path);
"compression" => LEVELDB_ZLIB_RAW_COMPRESSION
]);
if($generatorType === self::GENERATOR_FLAT and isset($options["preset"])){ if($generatorType === self::GENERATOR_FLAT and isset($options["preset"])){
$layers = explode(";", $options["preset"])[1] ?? ""; $layers = explode(";", $options["preset"])[1] ?? "";