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

World: avoid calling the same logic twice in requestChunkPopulation()

Browse Source 
orderChunkPopulation() checks the preconditions too. Have them both call an internal function that doesn't.
This commit is contained in:
Dylan K. Taylor 2021-11-01 00:36:57 +00:00
parent e4a54f5b6a
commit c781efcf90
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/world/World.php
View File

@ -2829,7 +2829,7 @@ class World implements ChunkManager{
//too many chunks are already generating; delay resolution of the request until later //too many chunks are already generating; delay resolution of the request until later
return $resolver?->getPromise() ?? $this->enqueuePopulationRequest($chunkX, $chunkZ, $associatedChunkLoader); return $resolver?->getPromise() ?? $this->enqueuePopulationRequest($chunkX, $chunkZ, $associatedChunkLoader);
} }
return $this->orderChunkPopulation($chunkX, $chunkZ, $associatedChunkLoader); return $this->internalOrderChunkPopulation($chunkX, $chunkZ, $associatedChunkLoader, $resolver);
} }
/** /**
@ -2848,6 +2848,14 @@ class World implements ChunkManager{
return $resolver?->getPromise() ?? $this->enqueuePopulationRequest($chunkX, $chunkZ, $associatedChunkLoader); return $resolver?->getPromise() ?? $this->enqueuePopulationRequest($chunkX, $chunkZ, $associatedChunkLoader);
} }
return $this->internalOrderChunkPopulation($chunkX, $chunkZ, $associatedChunkLoader, $resolver);
}
/**
* @phpstan-param PromiseResolver<Chunk>|null $resolver
* @phpstan-return Promise<Chunk>
*/
private function internalOrderChunkPopulation(int $chunkX, int $chunkZ, ?ChunkLoader $associatedChunkLoader, ?PromiseResolver $resolver) : Promise{
$chunkHash = World::chunkHash($chunkX, $chunkZ); $chunkHash = World::chunkHash($chunkX, $chunkZ);
Timings::$population->startTiming(); Timings::$population->startTiming();