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

Level: Simplify internal chunk ticking handling

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-01-26 13:48:43 +00:00
parent 519f6e2668
commit eac8f639a7
2 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/pocketmine.yml
View File

@ -133,7 +133,6 @@ chunk-ticking:
#Radius of chunks around a player to tick #Radius of chunks around a player to tick
tick-radius: 3 tick-radius: 3
light-updates: false light-updates: false
clear-tick-list: true
#IDs of blocks not to perform random ticking on. #IDs of blocks not to perform random ticking on.
disable-block-ticking: disable-block-ticking:
#- 2 # grass #- 2 # grass

43
src/pocketmine/level/Level.php
View File

@ -248,12 +248,8 @@ class Level implements ChunkManager, Metadatable{
/** @var int */ /** @var int */
private $chunkTickRadius; private $chunkTickRadius;
/** @var int[] */
private $chunkTickList = [];
/** @var int */ /** @var int */
private $chunksPerTick; private $chunksPerTick;
/** @var bool */
private $clearChunksOnTick;
/** @var \SplFixedArray<bool> */ /** @var \SplFixedArray<bool> */
private $randomTickBlocks = null; private $randomTickBlocks = null;
@ -384,7 +380,6 @@ class Level implements ChunkManager, Metadatable{
$this->chunkTickRadius = min($this->server->getViewDistance(), max(1, (int) $this->server->getProperty("chunk-ticking.tick-radius", 4))); $this->chunkTickRadius = min($this->server->getViewDistance(), max(1, (int) $this->server->getProperty("chunk-ticking.tick-radius", 4)));
$this->chunksPerTick = (int) $this->server->getProperty("chunk-ticking.per-tick", 40); $this->chunksPerTick = (int) $this->server->getProperty("chunk-ticking.per-tick", 40);
$this->chunkPopulationQueueSize = (int) $this->server->getProperty("chunk-generation.population-queue-size", 2); $this->chunkPopulationQueueSize = (int) $this->server->getProperty("chunk-generation.population-queue-size", 2);
$this->clearChunksOnTick = (bool) $this->server->getProperty("chunk-ticking.clear-tick-list", true);
$dontTickBlocks = array_fill_keys($this->server->getProperty("chunk-ticking.disable-block-ticking", []), true); $dontTickBlocks = array_fill_keys($this->server->getProperty("chunk-ticking.disable-block-ticking", []), true);
@ -961,10 +956,12 @@ class Level implements ChunkManager, Metadatable{
private function tickChunks(){ private function tickChunks(){
if($this->chunksPerTick <= 0 or count($this->loaders) === 0){ if($this->chunksPerTick <= 0 or count($this->loaders) === 0){
$this->chunkTickList = [];
return; return;
} }
/** @var bool[] $chunkTickList chunkhash => dummy */
$chunkTickList = [];
$chunksPerLoader = min(200, max(1, (int) ((($this->chunksPerTick - count($this->loaders)) / count($this->loaders)) + 0.5))); $chunksPerLoader = min(200, max(1, (int) ((($this->chunksPerTick - count($this->loaders)) / count($this->loaders)) + 0.5)));
$randRange = 3 + $chunksPerLoader / 30; $randRange = 3 + $chunksPerLoader / 30;
$randRange = (int) ($randRange > $this->chunkTickRadius ? $this->chunkTickRadius : $randRange); $randRange = (int) ($randRange > $this->chunkTickRadius ? $this->chunkTickRadius : $randRange);
@ -974,33 +971,27 @@ class Level implements ChunkManager, Metadatable{
$chunkZ = (int) floor($loader->getZ()) >> 4; $chunkZ = (int) floor($loader->getZ()) >> 4;
$index = Level::chunkHash($chunkX, $chunkZ); $index = Level::chunkHash($chunkX, $chunkZ);
$existingLoaders = max(0, $this->chunkTickList[$index] ?? 0); $chunkTickList[$index] = true;
$this->chunkTickList[$index] = $existingLoaders + 1;
for($chunk = 0; $chunk < $chunksPerLoader; ++$chunk){ for($chunk = 0; $chunk < $chunksPerLoader; ++$chunk){
$dx = mt_rand(-$randRange, $randRange); $dx = mt_rand(-$randRange, $randRange);
$dz = mt_rand(-$randRange, $randRange); $dz = mt_rand(-$randRange, $randRange);
$hash = Level::chunkHash($dx + $chunkX, $dz + $chunkZ); $hash = Level::chunkHash($dx + $chunkX, $dz + $chunkZ);
if(!isset($this->chunkTickList[$hash]) and isset($this->chunks[$hash])){ if(!isset($chunkTickList[$hash]) and isset($this->chunks[$hash])){
$this->chunkTickList[$hash] = -1; //check adjacent chunks are loaded
}
}
}
foreach($this->chunkTickList as $index => $loaders){
Level::getXZ($index, $chunkX, $chunkZ);
for($cx = -1; $cx <= 1; ++$cx){ for($cx = -1; $cx <= 1; ++$cx){
for($cz = -1; $cz <= 1; ++$cz){ for($cz = -1; $cz <= 1; ++$cz){
if(!isset($this->chunks[Level::chunkHash($chunkX + $cx, $chunkZ + $cz)])){ if(!isset($this->chunks[Level::chunkHash($chunkX + $cx, $chunkZ + $cz)])){
unset($this->chunkTickList[$index]); continue 3;
goto skip_to_next; //no "continue 3" thanks! }
}
}
$chunkTickList[$hash] = true;
} }
} }
} }
if($loaders <= 0){ foreach($chunkTickList as $index => $_){
unset($this->chunkTickList[$index]); Level::getXZ($index, $chunkX, $chunkZ);
}
$chunk = $this->chunks[$index]; $chunk = $this->chunks[$index];
foreach($chunk->getEntities() as $entity){ foreach($chunk->getEntities() as $entity){
@ -1031,12 +1022,6 @@ class Level implements ChunkManager, Metadatable{
} }
} }
} }
skip_to_next: //dummy label to break out of nested loops
}
if($this->clearChunksOnTick){
$this->chunkTickList = [];
} }
} }
@ -2637,7 +2622,6 @@ class Level implements ChunkManager, Metadatable{
private function queueUnloadChunk(int $x, int $z){ private function queueUnloadChunk(int $x, int $z){
$this->unloadQueue[$index = Level::chunkHash($x, $z)] = microtime(true); $this->unloadQueue[$index = Level::chunkHash($x, $z)] = microtime(true);
unset($this->chunkTickList[$index]);
} }
public function unloadChunkRequest(int $x, int $z, bool $safe = true){ public function unloadChunkRequest(int $x, int $z, bool $safe = true){
@ -2692,7 +2676,6 @@ class Level implements ChunkManager, Metadatable{
} }
unset($this->chunks[$chunkHash]); unset($this->chunks[$chunkHash]);
unset($this->chunkTickList[$chunkHash]);
unset($this->chunkCache[$chunkHash]); unset($this->chunkCache[$chunkHash]);
unset($this->blockCache[$chunkHash]); unset($this->blockCache[$chunkHash]);
unset($this->changedBlocks[$chunkHash]); unset($this->changedBlocks[$chunkHash]);