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

Convert GeneratorManager to singleton

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-05-23 10:13:03 +01:00
parent 640428c415
commit c9af5ce7a9
9 changed files with 28 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/world/format/io/FormatConverter.php
View File

@@ -101,7 +101,7 @@ class FormatConverter{
$this->logger->info("Found previous conversion attempt, deleting...");
Filesystem::recursiveUnlink($convertedOutput);
}
$this->newProvider::generate($convertedOutput, $data->getName(), $data->getSeed(), GeneratorManager::getGenerator($data->getGenerator()), $data->getGeneratorOptions());
$this->newProvider::generate($convertedOutput, $data->getName(), $data->getSeed(), GeneratorManager::getInstance()->getGenerator($data->getGenerator()), $data->getGeneratorOptions());
/**
* @see WritableWorldProvider::__construct()

2
src/world/format/io/data/BedrockWorldData.php
View File

@@ -102,7 +102,7 @@ class BedrockWorldData extends BaseNbtWorldData{
//Additional PocketMine-MP fields
->setTag("GameRules", new CompoundTag())
->setByte("hardcore", ($options["hardcore"] ?? false) === true ? 1 : 0)
->setString("generatorName", GeneratorManager::getGeneratorName($generator))
->setString("generatorName", GeneratorManager::getInstance()->getGeneratorName($generator))
->setString("generatorOptions", $options["preset"] ?? "");
$nbt = new LittleEndianNbtSerializer();

2
src/world/format/io/data/JavaWorldData.php
View File

@@ -64,7 +64,7 @@ class JavaWorldData extends BaseNbtWorldData{
->setLong("RandomSeed", $seed)
->setLong("SizeOnDisk", 0)
->setLong("Time", 0)
->setString("generatorName", GeneratorManager::getGeneratorName($generator))
->setString("generatorName", GeneratorManager::getInstance()->getGeneratorName($generator))
->setString("generatorOptions", $options["preset"] ?? "")
->setString("LevelName", $name)
->setTag("GameRules", new CompoundTag());