Merge commit '799183e13e61e89cc6820ad3132a4147454017c6'

# Conflicts:
#	resources/vanilla
#	src/Server.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/level/format/io/LevelProviderManager.php
#	src/pocketmine/tile/Tile.php
#	src/world/generator/GeneratorManager.php
This commit is contained in:
Dylan K. Taylor
2020-01-31 21:26:40 +00:00
6 changed files with 26 additions and 4 deletions

View File

@@ -235,6 +235,7 @@ class WorldManager{
* Generates a new world if it does not exist
*
* @param string $generator Class name that extends pocketmine\world\generator\Generator
* @phpstan-param class-string<Generator> $generator
*
* @throws \InvalidArgumentException
*/