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

@ -34,9 +34,15 @@ use function reset;
final class TileFactory{
/** @var string[] classes that extend Tile */
/**
* @var string[] classes that extend Tile
* @phpstan-var array<string, class-string<Tile>>
*/
private static $knownTiles = [];
/** @var string[][] */
/**
* @var string[][]
* @phpstan-var array<class-string<Tile>, list<string>>
*/
private static $saveNames = [];
/** @var string[] base class => overridden class */
private static $classMapping = [];
@ -90,6 +96,7 @@ final class TileFactory{
/**
* @param string[] $saveNames
* @phpstan-param class-string<Tile> $className
*/
public static function register(string $className, array $saveNames = []) : void{
Utils::testValidInstance($className, Tile::class);