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

Merge commit 'a5764b3ae98a70fe8f20f9b403a4ab84b51b11d8'

Browse Source 
# 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
parent 301460a0ea a5764b3ae9
commit 465d8cda79
8 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/world/generator/Flat.php
View File

@ -51,6 +51,8 @@ class Flat extends Generator{
private $preset;
/**
* @param mixed[] $options
*
* @throws InvalidGeneratorOptionsException
*/
public function __construct(ChunkManager $world, int $seed, array $options = []){