mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-13 23:15:29 +00:00
Code Issues Projects Releases Wiki Activity

generalized conditions for saving entities with chunks

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-11-19 18:06:38 +00:00
parent 19dc22d6b3
commit a9df383346
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -667,6 +667,13 @@ class Chunk{
return $this->entities; return $this->entities;
} }
/**
* @return Entity[]
*/
public function getSavableEntities() : array{
return array_filter($this->entities, function(Entity $entity) : bool{ return $entity->canSaveWithChunk() and !$entity->isClosed(); });
}
/** /**
* @return Tile[] * @return Tile[]
*/ */

8
src/pocketmine/level/format/io/leveldb/LevelDB.php
View File

@ -537,11 +537,9 @@ class LevelDB extends BaseLevelProvider{
/** @var CompoundTag[] $entities */ /** @var CompoundTag[] $entities */
$entities = []; $entities = [];
foreach($chunk->getEntities() as $entity){ foreach($chunk->getSavableEntities() as $entity){
if($entity->canSaveWithChunk() and !$entity->isClosed()){ $entity->saveNBT();
$entity->saveNBT(); $entities[] = $entity->namedtag;
$entities[] = $entity->namedtag;
}
} }
$this->writeTags($entities, $index . self::TAG_ENTITY); $this->writeTags($entities, $index . self::TAG_ENTITY);

8
src/pocketmine/level/format/io/region/Anvil.php
View File

@ -66,11 +66,9 @@ class Anvil extends McRegion{
$entities = []; $entities = [];
foreach($chunk->getEntities() as $entity){ foreach($chunk->getSavableEntities() as $entity){
if($entity->canSaveWithChunk() and !$entity->isClosed()){ $entity->saveNBT();
$entity->saveNBT(); $entities[] = $entity->namedtag;
$entities[] = $entity->namedtag;
}
} }
$nbt->setTag(new ListTag("Entities", $entities, NBT::TAG_Compound)); $nbt->setTag(new ListTag("Entities", $entities, NBT::TAG_Compound));

8
src/pocketmine/level/format/io/region/McRegion.php
View File

@ -87,11 +87,9 @@ class McRegion extends BaseLevelProvider{
$entities = []; $entities = [];
foreach($chunk->getEntities() as $entity){ foreach($chunk->getSavableEntities() as $entity){
if($entity->canSaveWithChunk() and !$entity->isClosed()){ $entity->saveNBT();
$entity->saveNBT(); $entities[] = $entity->namedtag;
$entities[] = $entity->namedtag;
}
} }
$nbt->setTag(new ListTag("Entities", $entities, NBT::TAG_Compound)); $nbt->setTag(new ListTag("Entities", $entities, NBT::TAG_Compound));