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

SimpleChunkManager: implement last-access performance optimization

Browse Source 
this improves performance of writing blocks by ~30%.
This commit is contained in:
Dylan K. Taylor 2019-06-27 16:53:24 +01:00
parent 45f5f112dd
commit 6da2bd4bb3
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/pocketmine/world/SimpleChunkManager.php
View File

@ -27,6 +27,7 @@ use pocketmine\block\Block;
use pocketmine\block\BlockFactory; use pocketmine\block\BlockFactory;
use pocketmine\block\BlockLegacyIds; use pocketmine\block\BlockLegacyIds;
use pocketmine\world\format\Chunk; use pocketmine\world\format\Chunk;
use pocketmine\world\utils\SubChunkIteratorManager;
use const INT32_MAX; use const INT32_MAX;
use const INT32_MIN; use const INT32_MIN;
@ -37,6 +38,9 @@ class SimpleChunkManager implements ChunkManager{
protected $worldHeight; protected $worldHeight;
/** @var SubChunkIteratorManager */
protected $terrainPointer;
/** /**
* SimpleChunkManager constructor. * SimpleChunkManager constructor.
* *
@ -44,48 +48,49 @@ class SimpleChunkManager implements ChunkManager{
*/ */
public function __construct(int $worldHeight = World::Y_MAX){ public function __construct(int $worldHeight = World::Y_MAX){
$this->worldHeight = $worldHeight; $this->worldHeight = $worldHeight;
$this->terrainPointer = new SubChunkIteratorManager($this);
} }
public function getBlockAt(int $x, int $y, int $z) : Block{ public function getBlockAt(int $x, int $y, int $z) : Block{
if($chunk = $this->getChunk($x >> 4, $z >> 4)){ if($this->terrainPointer->moveTo($x, $y, $z, false)){
return BlockFactory::fromFullBlock($chunk->getFullBlock($x & 0xf, $y, $z & 0xf)); return BlockFactory::fromFullBlock($this->terrainPointer->currentSubChunk->getFullBlock($x & 0xf, $y & 0xf, $z & 0xf));
} }
return BlockFactory::get(BlockLegacyIds::AIR); return BlockFactory::get(BlockLegacyIds::AIR);
} }
public function setBlockAt(int $x, int $y, int $z, Block $block) : bool{ public function setBlockAt(int $x, int $y, int $z, Block $block) : bool{
if(($chunk = $this->getChunk($x >> 4, $z >> 4)) !== null){ if($this->terrainPointer->moveTo($x, $y, $z, false)){
$chunk->setFullBlock($x & 0xf, $y, $z & 0xf, $block->getFullId()); $this->terrainPointer->currentSubChunk->setFullBlock($x & 0xf, $y & 0xf, $z & 0xf, $block->getFullId());
return true; return true;
} }
return false; return false;
} }
public function getBlockLightAt(int $x, int $y, int $z) : int{ public function getBlockLightAt(int $x, int $y, int $z) : int{
if($chunk = $this->getChunk($x >> 4, $z >> 4)){ if($this->terrainPointer->moveTo($x, $y, $z, false)){
return $chunk->getBlockLight($x & 0xf, $y, $z & 0xf); return $this->terrainPointer->currentSubChunk->getBlockLight($x & 0xf, $y & 0xf, $z & 0xf);
} }
return 0; return 0;
} }
public function setBlockLightAt(int $x, int $y, int $z, int $level) : void{ public function setBlockLightAt(int $x, int $y, int $z, int $level) : void{
if($chunk = $this->getChunk($x >> 4, $z >> 4)){ if($this->terrainPointer->moveTo($x, $y, $z, false)){
$chunk->setBlockLight($x & 0xf, $y, $z & 0xf, $level); $this->terrainPointer->currentSubChunk->setBlockLight($x & 0xf, $y & 0xf, $z & 0xf, $level);
} }
} }
public function getBlockSkyLightAt(int $x, int $y, int $z) : int{ public function getBlockSkyLightAt(int $x, int $y, int $z) : int{
if($chunk = $this->getChunk($x >> 4, $z >> 4)){ if($this->terrainPointer->moveTo($x, $y, $z, false)){
return $chunk->getBlockSkyLight($x & 0xf, $y, $z & 0xf); return $this->terrainPointer->currentSubChunk->getBlockSkyLight($x & 0xf, $y & 0xf, $z & 0xf);
} }
return 0; return 0;
} }
public function setBlockSkyLightAt(int $x, int $y, int $z, int $level) : void{ public function setBlockSkyLightAt(int $x, int $y, int $z, int $level) : void{
if($chunk = $this->getChunk($x >> 4, $z >> 4)){ if($this->terrainPointer->moveTo($x, $y, $z, false)){
$chunk->setBlockSkyLight($x & 0xf, $y, $z & 0xf, $level); $this->terrainPointer->currentSubChunk->setBlockSkyLight($x & 0xf, $y & 0xf, $z & 0xf, $level);
} }
} }