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

Chunk: remove useless instanceof checks

Browse Source 
these are always CompoundTags, and if they aren't we have a bug somewhere else.
This commit is contained in:
Dylan K. Taylor 2020-02-05 20:44:27 +00:00
parent 2f325b8c91
commit e1ddf90695
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -687,23 +687,21 @@ class Chunk{
$level->timings->syncChunkLoadEntitiesTimer->startTiming(); $level->timings->syncChunkLoadEntitiesTimer->startTiming();
foreach($this->NBTentities as $nbt){ foreach($this->NBTentities as $nbt){
if($nbt instanceof CompoundTag){ if(!$nbt->hasTag("id")){ //allow mixed types (because of leveldb)
if(!$nbt->hasTag("id")){ //allow mixed types (because of leveldb) $changed = true;
$changed = true; continue;
continue; }
}
try{ try{
$entity = Entity::createEntity($nbt->getTag("id")->getValue(), $level, $nbt); $entity = Entity::createEntity($nbt->getTag("id")->getValue(), $level, $nbt);
if(!($entity instanceof Entity)){ if(!($entity instanceof Entity)){
$changed = true;
continue;
}
}catch(\Throwable $t){
$level->getServer()->getLogger()->logException($t);
$changed = true; $changed = true;
continue; continue;
} }
}catch(\Throwable $t){
$level->getServer()->getLogger()->logException($t);
$changed = true;
continue;
} }
} }
$this->NBTentities = []; $this->NBTentities = [];
@ -711,16 +709,14 @@ class Chunk{
$level->timings->syncChunkLoadTileEntitiesTimer->startTiming(); $level->timings->syncChunkLoadTileEntitiesTimer->startTiming();
foreach($this->NBTtiles as $nbt){ foreach($this->NBTtiles as $nbt){
if($nbt instanceof CompoundTag){ if(!$nbt->hasTag(Tile::TAG_ID, StringTag::class)){
if(!$nbt->hasTag(Tile::TAG_ID, StringTag::class)){ $changed = true;
$changed = true; continue;
continue; }
}
if(Tile::createTile($nbt->getString(Tile::TAG_ID), $level, $nbt) === null){ if(Tile::createTile($nbt->getString(Tile::TAG_ID), $level, $nbt) === null){
$changed = true; $changed = true;
continue; continue;
}
} }
} }