mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-08-31 07:21:17 +00:00
Code Issues Projects Releases Wiki Activity

Fixed entities not loading on imported MCPE worlds

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-03-21 20:03:10 +00:00
parent b8d1eb20b0
commit 3dbed830ef
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pocketmine/entity/EntityFactory.php
View File

@ -207,6 +207,9 @@ final class EntityFactory{
*/ */
public static function createFromData(Level $level, CompoundTag $nbt) : ?Entity{ public static function createFromData(Level $level, CompoundTag $nbt) : ?Entity{
$saveId = $nbt->getTag("id"); $saveId = $nbt->getTag("id");
if($saveId === null){
$saveId = $nbt->getTag("identifier"); //new MCPE format
}
$baseClass = null; $baseClass = null;
if($saveId instanceof StringTag){ if($saveId instanceof StringTag){
$baseClass = self::$knownEntities[$saveId->getValue()] ?? null; $baseClass = self::$knownEntities[$saveId->getValue()] ?? null;

2
src/pocketmine/level/format/Chunk.php
View File

@ -586,7 +586,7 @@ class Chunk{
try{ try{
$entity = EntityFactory::createFromData($level, $nbt); $entity = EntityFactory::createFromData($level, $nbt);
if(!($entity instanceof Entity)){ if(!($entity instanceof Entity)){
$level->getServer()->getLogger()->warning("Chunk $this->x $this->z: Deleted unknown entity type " . $nbt->getString("id", "<unknown>", true)); $level->getServer()->getLogger()->warning("Chunk $this->x $this->z: Deleted unknown entity type " . $nbt->getString("id", $nbt->getString("identifier", "<unknown>", true), true));
$changed = true; $changed = true;
continue; continue;
} }