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

PopulationTask: stop using dynamic properties

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-10-26 20:21:58 +01:00
parent fca70efbb1
commit 1873457840
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 27 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/world/generator/PopulationTask.php
View File

@ -31,7 +31,12 @@ use pocketmine\world\format\Chunk;
use pocketmine\world\format\io\FastChunkSerializer;
use pocketmine\world\SimpleChunkManager;
use pocketmine\world\World;
use function array_map;
use function igbinary_serialize;
use function igbinary_unserialize;
use function intdiv;
use function is_array;
use function is_string;
class PopulationTask extends AsyncTask{
private const TLS_KEY_WORLD = "world";
@ -46,25 +51,7 @@ class PopulationTask extends AsyncTask{
/** @var string|null */
public $chunk;
/** @var string|null */
public $chunk0;
/** @var string|null */
public $chunk1;
/** @var string|null */
public $chunk2;
/** @var string|null */
public $chunk3;
//center chunk
/** @var string|null */
public $chunk5;
/** @var string|null */
public $chunk6;
/** @var string|null */
public $chunk7;
/** @var string|null */
public $chunk8;
private string $adjacentChunks;
public function __construct(World $world, int $chunkX, int $chunkZ, ?Chunk $chunk){
$this->worldId = $world->getId();
@ -72,9 +59,10 @@ class PopulationTask extends AsyncTask{
$this->chunkZ = $chunkZ;
$this->chunk = $chunk !== null ? FastChunkSerializer::serializeTerrain($chunk) : null;
foreach($world->getAdjacentChunks($chunkX, $chunkZ) as $i => $c){
$this->{"chunk$i"} = $c !== null ? FastChunkSerializer::serializeTerrain($c) : null;
}
$this->adjacentChunks = igbinary_serialize(array_map(
fn(?Chunk $c) => $c !== null ? FastChunkSerializer::serializeTerrain($c) : null,
$world->getAdjacentChunks($chunkX, $chunkZ)
)) ?? throw new AssumptionFailedError("igbinary_serialize() returned null");
$this->storeLocal(self::TLS_KEY_WORLD, $world);
}
@ -87,27 +75,19 @@ class PopulationTask extends AsyncTask{
$generator = $context->getGenerator();
$manager = new SimpleChunkManager($context->getWorldMinY(), $context->getWorldMaxY());
/** @var Chunk[] $chunks */
$chunks = [];
$oldModCounts = [];
$chunk = $this->chunk !== null ? FastChunkSerializer::deserializeTerrain($this->chunk) : null;
for($i = 0; $i < 9; ++$i){
if($i === 4){
continue;
}
$ck = $this->{"chunk$i"};
if($ck === null){
$chunks[$i] = null;
}else{
$chunks[$i] = FastChunkSerializer::deserializeTerrain($ck);
$oldModCounts[$i] = $chunks[$i]->getModificationCount();
}
}
/** @var string[] $serialChunks */
$serialChunks = igbinary_unserialize($this->adjacentChunks);
$chunks = array_map(
fn(?string $serialized) => $serialized !== null ? FastChunkSerializer::deserializeTerrain($serialized) : null,
$serialChunks
);
$oldModCounts = array_map(fn(?Chunk $chunk) => $chunk !== null ? $chunk->getModificationCount() : null, $chunks);
self::setOrGenerateChunk($manager, $generator, $this->chunkX, $this->chunkZ, $chunk);
/** @var Chunk[] $resultChunks */
$resultChunks = []; //this is just to keep phpstan's type inference happy
foreach($chunks as $i => $c){
$cX = (-1 + $i % 3) + $this->chunkX;
@ -125,10 +105,11 @@ class PopulationTask extends AsyncTask{
$this->chunk = FastChunkSerializer::serializeTerrain($chunk);
$serialChunks = [];
foreach($chunks as $i => $c){
$oldModCount = $oldModCounts[$i] ?? 0;
$this->{"chunk$i"} = $oldModCount !== $c->getModificationCount() ? FastChunkSerializer::serializeTerrain($c) : null;
$serialChunks[$i] = $oldModCounts[$i] !== $c->getModificationCount() ? FastChunkSerializer::serializeTerrain($c) : null;
}
$this->adjacentChunks = igbinary_serialize($serialChunks) ?? throw new AssumptionFailedError("igbinary_serialize() returned null");
}
private static function setOrGenerateChunk(SimpleChunkManager $manager, Generator $generator, int $chunkX, int $chunkZ, ?Chunk $chunk) : Chunk{
@ -153,12 +134,13 @@ class PopulationTask extends AsyncTask{
FastChunkSerializer::deserializeTerrain($this->chunk) :
throw new AssumptionFailedError("Center chunk should never be null");
/**
* @var string[]|null[] $serialAdjacentChunks
* @phpstan-var array<int, string|null> $serialAdjacentChunks
*/
$serialAdjacentChunks = igbinary_unserialize($this->adjacentChunks);
$adjacentChunks = [];
for($i = 0; $i < 9; ++$i){
if($i === 4){
continue;
}
$c = $this->{"chunk$i"};
foreach($serialAdjacentChunks as $i => $c){
if($c !== null){
$xx = -1 + $i % 3;
$zz = -1 + intdiv($i, 3);

5
tests/phpstan/configs/actual-problems.neon
View File

@ -5,8 +5,3 @@ parameters:
count: 1
path: ../../../src/event/entity/EntityShootBowEvent.php
-
message: "#^Variable property access on \\$this\\(pocketmine\\\\world\\\\generator\\\\PopulationTask\\)\\.$#"
count: 4
path: ../../../src/world/generator/PopulationTask.php