mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-18 04:00:29 +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

10
src/entity/EntityFactory.php
View File

@@ -66,8 +66,8 @@ final class EntityFactory{
*/
private $creationFuncs = [];
/**
* @var string[][]
* @phpstan-var array<class-string<Entity>, list<string>>
* @var string[]
* @phpstan-var array<class-string<Entity>, string>
*/
private $saveNames = [];
@@ -201,7 +201,7 @@ final class EntityFactory{
$this->creationFuncs[$legacyMcpeSaveId] = $creationFunc;
}
$this->saveNames[$className] = $saveNames;
$this->saveNames[$className] = reset($saveNames);
}
/**
@@ -229,7 +229,7 @@ final class EntityFactory{
public function injectSaveId(string $class, CompoundTag $saveData) : void{
if(isset($this->saveNames[$class])){
$saveData->setTag("id", new StringTag(reset($this->saveNames[$class])));
$saveData->setTag("id", new StringTag($this->saveNames[$class]));
}else{
throw new \InvalidArgumentException("Entity $class is not registered");
}
@@ -240,7 +240,7 @@ final class EntityFactory{
*/
public function getSaveId(string $class) : string{
if(isset($this->saveNames[$class])){
return reset($this->saveNames[$class]);
return $this->saveNames[$class];
}
throw new \InvalidArgumentException("Entity $class is not registered");
}