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

Chunk: drop premature optimizations

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-06-14 18:07:13 +01:00
parent 722da5e88d
commit 92035ac2ec
1 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/pocketmine/world/format/Chunk.php
View File

@ -64,9 +64,6 @@ class Chunk{
/** @var bool */ /** @var bool */
protected $hasChanged = false; protected $hasChanged = false;
/** @var bool */
protected $isInit = false;
/** @var bool */ /** @var bool */
protected $lightPopulated = false; protected $lightPopulated = false;
/** @var bool */ /** @var bool */
@ -464,7 +461,7 @@ class Chunk{
throw new \InvalidArgumentException("Attempted to add a garbage closed Entity to a chunk"); throw new \InvalidArgumentException("Attempted to add a garbage closed Entity to a chunk");
} }
$this->entities[$entity->getId()] = $entity; $this->entities[$entity->getId()] = $entity;
if(!($entity instanceof Player) and $this->isInit){ if(!($entity instanceof Player)){
$this->hasChanged = true; $this->hasChanged = true;
} }
} }
@ -474,7 +471,7 @@ class Chunk{
*/ */
public function removeEntity(Entity $entity) : void{ public function removeEntity(Entity $entity) : void{
unset($this->entities[$entity->getId()]); unset($this->entities[$entity->getId()]);
if(!($entity instanceof Player) and $this->isInit){ if(!($entity instanceof Player)){
$this->hasChanged = true; $this->hasChanged = true;
} }
} }
@ -491,9 +488,7 @@ class Chunk{
$this->tiles[$index]->close(); $this->tiles[$index]->close();
} }
$this->tiles[$index] = $tile; $this->tiles[$index] = $tile;
if($this->isInit){ $this->hasChanged = true;
$this->hasChanged = true;
}
} }
/** /**
@ -501,9 +496,7 @@ class Chunk{
*/ */
public function removeTile(Tile $tile) : void{ public function removeTile(Tile $tile) : void{
unset($this->tiles[Chunk::blockHash($tile->x, $tile->y, $tile->z)]); unset($this->tiles[Chunk::blockHash($tile->x, $tile->y, $tile->z)]);
if($this->isInit){ $this->hasChanged = true;
$this->hasChanged = true;
}
} }
/** /**
@ -578,47 +571,43 @@ class Chunk{
* @param World $world * @param World $world
*/ */
public function initChunk(World $world) : void{ public function initChunk(World $world) : void{
if(!$this->isInit){ if($this->NBTentities !== null){
if($this->NBTentities !== null){ $this->hasChanged = true;
$this->hasChanged = true; $world->timings->syncChunkLoadEntitiesTimer->startTiming();
$world->timings->syncChunkLoadEntitiesTimer->startTiming(); foreach($this->NBTentities as $nbt){
foreach($this->NBTentities as $nbt){ if($nbt instanceof CompoundTag){
if($nbt instanceof CompoundTag){ try{
try{ $entity = EntityFactory::createFromData($world, $nbt);
$entity = EntityFactory::createFromData($world, $nbt); if(!($entity instanceof Entity)){
if(!($entity instanceof Entity)){ $world->getLogger()->warning("Chunk $this->x $this->z: Deleted unknown entity type " . $nbt->getString("id", $nbt->getString("identifier", "<unknown>", true), true));
$world->getLogger()->warning("Chunk $this->x $this->z: Deleted unknown entity type " . $nbt->getString("id", $nbt->getString("identifier", "<unknown>", true), true));
continue;
}
}catch(\Exception $t){ //TODO: this shouldn't be here
$world->getLogger()->logException($t);
continue; continue;
} }
}catch(\Exception $t){ //TODO: this shouldn't be here
$world->getLogger()->logException($t);
continue;
} }
} }
$this->NBTentities = null;
$world->timings->syncChunkLoadEntitiesTimer->stopTiming();
} }
if($this->NBTtiles !== null){
$this->hasChanged = true; $this->NBTentities = null;
$world->timings->syncChunkLoadTileEntitiesTimer->startTiming(); $world->timings->syncChunkLoadEntitiesTimer->stopTiming();
foreach($this->NBTtiles as $nbt){ }
if($nbt instanceof CompoundTag){ if($this->NBTtiles !== null){
if(($tile = TileFactory::createFromData($world, $nbt)) !== null){ $this->hasChanged = true;
$world->addTile($tile); $world->timings->syncChunkLoadTileEntitiesTimer->startTiming();
}else{ foreach($this->NBTtiles as $nbt){
$world->getLogger()->warning("Chunk $this->x $this->z: Deleted unknown tile entity type " . $nbt->getString("id", "<unknown>", true)); if($nbt instanceof CompoundTag){
continue; if(($tile = TileFactory::createFromData($world, $nbt)) !== null){
} $world->addTile($tile);
}else{
$world->getLogger()->warning("Chunk $this->x $this->z: Deleted unknown tile entity type " . $nbt->getString("id", "<unknown>", true));
continue;
} }
} }
$this->NBTtiles = null;
$world->timings->syncChunkLoadTileEntitiesTimer->stopTiming();
} }
$this->isInit = true; $this->NBTtiles = null;
$world->timings->syncChunkLoadTileEntitiesTimer->stopTiming();
} }
} }