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 [];
 	}