mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-09 11:16:57 +00:00
Code Issues Projects Releases Wiki Activity

Reduce complexity of chunk sending system

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-05-07 19:26:01 +01:00
parent 51548d1a27
commit 78bb6f4a0c
2 changed files with 16 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/pocketmine/Player.php
View File

@ -969,30 +969,6 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
unset($this->loadQueue[$index]);
}
public function onChunkReady(int $x, int $z){
if(!$this->isConnected()){
return;
}
assert(isset($this->usedChunks[World::chunkHash($x, $z)]));
$this->usedChunks[World::chunkHash($x, $z)] = true;
$this->networkSession->startUsingChunk($x, $z, function(int $chunkX, int $chunkZ) : void{
if($this->spawned){
$this->spawnEntitiesOnChunk($chunkX, $chunkZ);
}elseif($this->spawnChunkLoadCount++ === $this->spawnThreshold){
$this->spawned = true;
foreach($this->usedChunks as $chunkHash => $_){
World::getXZ($chunkHash, $_x, $_z);
$this->spawnEntitiesOnChunk($_x, $_z);
}
$this->networkSession->onTerrainReady();
}
});
}
protected function spawnEntitiesOnChunk(int $chunkX, int $chunkZ) : void{
foreach($this->world->getChunkEntities($chunkX, $chunkZ) as $entity){
if($entity !== $this and !$entity->isClosed() and !$entity->isFlaggedForDespawn()){
@ -1030,7 +1006,22 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
}
unset($this->loadQueue[$index]);
$this->world->requestChunk($X, $Z, $this);
$this->usedChunks[$index] = true;
$this->networkSession->startUsingChunk($X, $Z, function(int $chunkX, int $chunkZ) : void{
if($this->spawned){
$this->spawnEntitiesOnChunk($chunkX, $chunkZ);
}elseif($this->spawnChunkLoadCount++ === $this->spawnThreshold){
$this->spawned = true;
foreach($this->usedChunks as $chunkHash => $_){
World::getXZ($chunkHash, $_x, $_z);
$this->spawnEntitiesOnChunk($_x, $_z);
}
$this->networkSession->onTerrainReady();
}
});
}
Timings::$playerChunkSendTimer->stopTiming();