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

World: Remove duplicated code

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-04-15 19:41:03 +01:00
parent 99ed87bc29
commit 9655cb819d
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/world/World.php
View File

@ -1293,9 +1293,9 @@ class World implements ChunkManager{
}
/**
* Returns the highest block light level available in the positions adjacent to the specified block coordinates.
* @phpstan-param \Closure(int $x, int $y, int $z) : int $lightGetter
*/
public function getHighestAdjacentPotentialBlockSkyLight(int $x, int $y, int $z) : int{
private function getHighestAdjacentLight(int $x, int $y, int $z, \Closure $lightGetter) : int{
$max = 0;
foreach([
[$x + 1, $y, $z],
@ -1312,11 +1312,18 @@ class World implements ChunkManager{
){
continue;
}
$max = max($max, $this->getPotentialBlockSkyLightAt($x1, $y1, $z1));
$max = max($max, $lightGetter($x1, $y1, $z1));
}
return $max;
}
/**
* Returns the highest block light level available in the positions adjacent to the specified block coordinates.
*/
public function getHighestAdjacentPotentialBlockSkyLight(int $x, int $y, int $z) : int{
return $this->getHighestAdjacentLight($x, $y, $z, \Closure::fromCallable([$this, 'getPotentialBlockSkyLightAt']));
}
/**
* Returns the highest block sky light available in the positions adjacent to the given coordinates, adjusted for
* the world's current time of day and weather conditions.
@ -1329,25 +1336,7 @@ class World implements ChunkManager{
* Returns the highest block light level available in the positions adjacent to the specified block coordinates.
*/
public function getHighestAdjacentBlockLight(int $x, int $y, int $z) : int{
$max = 0;
foreach([
[$x + 1, $y, $z],
[$x - 1, $y, $z],
[$x, $y + 1, $z],
[$x, $y - 1, $z],
[$x, $y, $z + 1],
[$x, $y, $z - 1]
] as [$x1, $y1, $z1]){
if(
!$this->isInWorld($x1, $y1, $z1) ||
($chunk = $this->getChunk($x1 >> 4, $z1 >> 4)) === null ||
$chunk->isLightPopulated() !== true
){
continue;
}
$max = max($max, $this->getBlockLightAt($x1, $y1, $z1));
}
return $max;
return $this->getHighestAdjacentLight($x, $y, $z, \Closure::fromCallable([$this, 'getBlockLightAt']));
}
private function executeQueuedLightUpdates() : void{