mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-05 01:16:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '799183e13e61e89cc6820ad3132a4147454017c6'

Browse Source 
# 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
parent cb16f5c142 799183e13e
commit f65bf76fd8
6 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/world/generator/GeneratorManager.php
View File

@ -51,6 +51,7 @@ final class GeneratorManager{
* @param string $class Fully qualified name of class that extends \pocketmine\world\generator\Generator
* @param string $name Alias for this generator type that can be written in configs
* @param bool $overwrite Whether to force overwriting any existing registered generator with the same name
* @phpstan-param class-string<Generator> $class
*
* @throws \InvalidArgumentException
*/
@ -78,7 +79,9 @@ final class GeneratorManager{
*
* @param bool $throwOnMissing @deprecated this is for backwards compatibility only
*
* @return string|Generator Name of class that extends Generator (not an actual Generator object)
* @return string Name of class that extends Generator
* @phpstan-return class-string<Generator>
*
* @throws \InvalidArgumentException if the generator type isn't registered
*/
public static function getGenerator(string $name, bool $throwOnMissing = false){
@ -96,6 +99,7 @@ final class GeneratorManager{
* Returns the registered name of the given Generator class.
*
* @param string $class Fully qualified name of class that extends \pocketmine\world\generator\Generator
* @phpstan-param class-string<Generator> $class
*
* @throws \InvalidArgumentException if the class type cannot be matched to a known alias
*/