Merge commit 'a5764b3ae98a70fe8f20f9b403a4ab84b51b11d8'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/level/format/io/LevelProvider.php
#	src/world/generator/Generator.php
#	src/world/generator/GeneratorRegisterTask.php

src/world/World.php

@@ -949,6 +949,9 @@ class World implements ChunkManager{
 		}
 	}
 
+	/**
+	 * @return mixed[]
+	 */
 	public function __debugInfo() : array{
 		return [];
 	}

src/world/format/io/WritableWorldProvider.php

@@ -28,6 +28,8 @@ use pocketmine\world\format\Chunk;
 interface WritableWorldProvider extends WorldProvider{
 	/**
 	 * Generate the needed files in the path given
+	 *
+	 * @param mixed[] $options
 	 */
 	public static function generate(string $path, string $name, int $seed, string $generator, array $options = []) : void;
 

src/world/generator/Flat.php

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

src/world/generator/Generator.php

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

src/world/generator/GeneratorRegisterTask.php

@@ -43,6 +43,9 @@ class GeneratorRegisterTask extends AsyncTask{
 	/** @var int */
 	public $worldHeight = World::Y_MAX;
 
+	/**
+	 * @param mixed[] $generatorSettings
+	 */
 	public function __construct(World $world, string $generatorClass, array $generatorSettings = []){
 		$this->generatorClass = $generatorClass;
 		$this->settings = serialize($generatorSettings);

src/world/generator/hell/Nether.php

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

src/world/generator/noise/Noise.php

@@ -263,6 +263,9 @@ abstract class Noise{
 		return $noiseArray;
 	}
 
+	/**
+	 * @return float[][][]
+	 */
 	public function getFastNoise3D(int $xSize, int $ySize, int $zSize, int $xSamplingRate, int $ySamplingRate, int $zSamplingRate, int $x, int $y, int $z) : array{
 
 		assert($xSamplingRate !== 0, new \InvalidArgumentException("xSamplingRate cannot be 0"));

src/world/generator/normal/Normal.php

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