Merge commit 'a5764b3ae98a70fe8f20f9b403a4ab84b51b11d8'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/level/format/io/LevelProvider.php
#	src/world/generator/Generator.php
#	src/world/generator/GeneratorRegisterTask.php
This commit is contained in:
Dylan K. Taylor
2020-01-31 19:32:38 +00:00
8 changed files with 19 additions and 0 deletions

View File

@ -60,6 +60,8 @@ abstract class Generator{
/**
* @throws InvalidGeneratorOptionsException
*
* @param mixed[] $options
*/
public function __construct(ChunkManager $world, int $seed, array $options = []){
$this->world = $world;