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

EntityFactory: remove obsolete indirection (class mappings are redundant here now)

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-06-19 22:18:42 +01:00
parent 0a43fd816c
commit 4e8e10ca45
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/entity/EntityFactory.php
View File

@ -61,15 +61,10 @@ final class EntityFactory{
use SingletonTrait; use SingletonTrait;
/** /**
* @var \Closure[] base class => creator function * @var \Closure[] save ID => creator function
* @phpstan-var array<class-string<Entity>, \Closure(World, CompoundTag) : Entity> * @phpstan-var array<int|string, \Closure(World, CompoundTag) : Entity>
*/ */
private $creationFuncs = []; private $creationFuncs = [];
/**
* @var string[]
* @phpstan-var array<int|string, class-string<Entity>>
*/
private $knownEntities = [];
/** /**
* @var string[][] * @var string[][]
* @phpstan-var array<class-string<Entity>, list<string>> * @phpstan-var array<class-string<Entity>, list<string>>
@ -198,15 +193,13 @@ final class EntityFactory{
throw new \InvalidArgumentException("At least one save name must be provided"); throw new \InvalidArgumentException("At least one save name must be provided");
} }
Utils::testValidInstance($className, Entity::class); Utils::testValidInstance($className, Entity::class);
self::validateCreationFunc($className, $creationFunc); self::validateCreationFunc($className, $creationFunc);
$this->creationFuncs[$className] = $creationFunc;
foreach($saveNames as $name){ foreach($saveNames as $name){
$this->knownEntities[$name] = $className; $this->creationFuncs[$name] = $creationFunc;
} }
if($legacyMcpeSaveId !== null){ if($legacyMcpeSaveId !== null){
$this->knownEntities[$legacyMcpeSaveId] = $className; $this->creationFuncs[$legacyMcpeSaveId] = $creationFunc;
} }
$this->saveNames[$className] = $saveNames; $this->saveNames[$className] = $saveNames;
@ -220,16 +213,15 @@ final class EntityFactory{
*/ */
public function createFromData(World $world, CompoundTag $nbt) : ?Entity{ public function createFromData(World $world, CompoundTag $nbt) : ?Entity{
$saveId = $nbt->getTag("id") ?? $nbt->getTag("identifier"); $saveId = $nbt->getTag("id") ?? $nbt->getTag("identifier");
$baseClass = null; $func = null;
if($saveId instanceof StringTag){ if($saveId instanceof StringTag){
$baseClass = $this->knownEntities[$saveId->getValue()] ?? null; $func = $this->creationFuncs[$saveId->getValue()] ?? null;
}elseif($saveId instanceof IntTag){ //legacy MCPE format }elseif($saveId instanceof IntTag){ //legacy MCPE format
$baseClass = $this->knownEntities[$saveId->getValue() & 0xff] ?? null; $func = $this->creationFuncs[$saveId->getValue() & 0xff] ?? null;
} }
if($baseClass === null){ if($func === null){
return null; return null;
} }
$func = $this->creationFuncs[$baseClass];
/** @var Entity $entity */ /** @var Entity $entity */
$entity = $func($world, $nbt); $entity = $func($world, $nbt);