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

Merge branch 'next-minor' into next-major

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-02-21 18:33:03 +00:00
commit 737a63b0a3
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/world/World.php
View File

@ -3128,6 +3128,7 @@ class World implements ChunkManager{
Timings::$population->startTiming(); Timings::$population->startTiming();
try{
for($xx = -1; $xx <= 1; ++$xx){ for($xx = -1; $xx <= 1; ++$xx){
for($zz = -1; $zz <= 1; ++$zz){ for($zz = -1; $zz <= 1; ++$zz){
if($this->isChunkLocked($chunkX + $xx, $chunkZ + $zz)){ if($this->isChunkLocked($chunkX + $xx, $chunkZ + $zz)){
@ -3145,7 +3146,8 @@ class World implements ChunkManager{
$chunkPopulationLockId = new ChunkLockId(); $chunkPopulationLockId = new ChunkLockId();
$temporaryChunkLoader = new class implements ChunkLoader{}; $temporaryChunkLoader = new class implements ChunkLoader{
};
for($xx = -1; $xx <= 1; ++$xx){ for($xx = -1; $xx <= 1; ++$xx){
for($zz = -1; $zz <= 1; ++$zz){ for($zz = -1; $zz <= 1; ++$zz){
$this->lockChunk($chunkX + $xx, $chunkZ + $zz, $chunkPopulationLockId); $this->lockChunk($chunkX + $xx, $chunkZ + $zz, $chunkPopulationLockId);
@ -3179,8 +3181,10 @@ class World implements ChunkManager{
} }
$this->workerPool->submitTaskToWorker($task, $workerId); $this->workerPool->submitTaskToWorker($task, $workerId);
Timings::$population->stopTiming();
return $resolver->getPromise(); return $resolver->getPromise();
}finally{
Timings::$population->stopTiming();
}
} }
/** /**