mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 10:22:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/tile/Tile.php
#	tests/phpstan/configs/check-explicit-mixed-baseline.neon
#	tests/phpstan/configs/l7-baseline.neon
This commit is contained in:
Dylan K. Taylor
2020-11-12 22:10:47 +00:00
parent 04b038ff4b 9f3fb935b5
commit 8e0cba56b8
4 changed files with 28 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/block/tile/TileFactory.php
View File

@ -42,8 +42,8 @@ final class TileFactory{
*/
private $knownTiles = [];
/**
* @var string[][]
* @phpstan-var array<class-string<Tile>, list<string>>
* @var string[]
* @phpstan-var array<class-string<Tile>, string>
*/
private $saveNames = [];
@ -108,7 +108,7 @@ final class TileFactory{
$this->knownTiles[$name] = $className;
}
$this->saveNames[$className] = $saveNames;
$this->saveNames[$className] = reset($saveNames);
}
/**
@ -136,7 +136,7 @@ final class TileFactory{
*/
public function getSaveId(string $class) : string{
if(isset($this->saveNames[$class])){
return reset($this->saveNames[$class]);
return $this->saveNames[$class];
}
throw new \InvalidArgumentException("Tile $class is not registered");
}