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

SubChunkIteratorManager now accepts $create as a moveTo() parameter instead of in the constructor

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-06-27 16:22:56 +01:00
parent 6f087190f4
commit 45f5f112dd
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/world/Explosion.php
View File

@ -83,7 +83,7 @@ class Explosion{
$this->size = $size; $this->size = $size;
$this->what = $what; $this->what = $what;
$this->subChunkHandler = new SubChunkIteratorManager($this->world, false); $this->subChunkHandler = new SubChunkIteratorManager($this->world);
} }
/** /**
@ -119,7 +119,7 @@ class Explosion{
$vBlock->y = $pointerY >= $y ? $y : $y - 1; $vBlock->y = $pointerY >= $y ? $y : $y - 1;
$vBlock->z = $pointerZ >= $z ? $z : $z - 1; $vBlock->z = $pointerZ >= $z ? $z : $z - 1;
if(!$this->subChunkHandler->moveTo($vBlock->x, $vBlock->y, $vBlock->z)){ if(!$this->subChunkHandler->moveTo($vBlock->x, $vBlock->y, $vBlock->z, false)){
continue; continue;
} }

8
src/pocketmine/world/light/LightUpdate.php
View File

@ -67,7 +67,7 @@ abstract class LightUpdate{
private function prepareNodes() : void{ private function prepareNodes() : void{
foreach($this->updateNodes as $blockHash => [$x, $y, $z, $newLevel]){ foreach($this->updateNodes as $blockHash => [$x, $y, $z, $newLevel]){
if($this->subChunkHandler->moveTo($x, $y, $z)){ if($this->subChunkHandler->moveTo($x, $y, $z, false)){
$oldLevel = $this->getLight($x, $y, $z); $oldLevel = $this->getLight($x, $y, $z);
if($oldLevel !== $newLevel){ if($oldLevel !== $newLevel){
@ -100,7 +100,7 @@ abstract class LightUpdate{
]; ];
foreach($points as list($cx, $cy, $cz)){ foreach($points as list($cx, $cy, $cz)){
if($this->subChunkHandler->moveTo($cx, $cy, $cz)){ if($this->subChunkHandler->moveTo($cx, $cy, $cz, true)){
$this->computeRemoveLight($cx, $cy, $cz, $oldAdjacentLight); $this->computeRemoveLight($cx, $cy, $cz, $oldAdjacentLight);
} }
} }
@ -111,7 +111,7 @@ abstract class LightUpdate{
unset($this->spreadVisited[World::blockHash($x, $y, $z)]); unset($this->spreadVisited[World::blockHash($x, $y, $z)]);
if(!$this->subChunkHandler->moveTo($x, $y, $z)){ if(!$this->subChunkHandler->moveTo($x, $y, $z, false)){
continue; continue;
} }
@ -130,7 +130,7 @@ abstract class LightUpdate{
]; ];
foreach($points as list($cx, $cy, $cz)){ foreach($points as list($cx, $cy, $cz)){
if($this->subChunkHandler->moveTo($cx, $cy, $cz)){ if($this->subChunkHandler->moveTo($cx, $cy, $cz, true)){
$this->computeSpreadLight($cx, $cy, $cz, $newAdjacentLight); $this->computeSpreadLight($cx, $cy, $cz, $newAdjacentLight);
} }
} }

11
src/pocketmine/world/utils/SubChunkIteratorManager.php
View File

@ -43,21 +43,18 @@ class SubChunkIteratorManager{
protected $currentY; protected $currentY;
/** @var int */ /** @var int */
protected $currentZ; protected $currentZ;
/** @var bool */
protected $allocateEmptySubs = true;
public function __construct(ChunkManager $world, bool $allocateEmptySubs = true){ public function __construct(ChunkManager $world){
$this->world = $world; $this->world = $world;
$this->allocateEmptySubs = $allocateEmptySubs;
} }
public function moveTo(int $x, int $y, int $z) : bool{ public function moveTo(int $x, int $y, int $z, bool $create) : bool{
if($this->currentChunk === null or $this->currentX !== ($x >> 4) or $this->currentZ !== ($z >> 4)){ if($this->currentChunk === null or $this->currentX !== ($x >> 4) or $this->currentZ !== ($z >> 4)){
$this->currentX = $x >> 4; $this->currentX = $x >> 4;
$this->currentZ = $z >> 4; $this->currentZ = $z >> 4;
$this->currentSubChunk = null; $this->currentSubChunk = null;
$this->currentChunk = $this->world->getChunk($this->currentX, $this->currentZ); $this->currentChunk = $this->world->getChunk($this->currentX, $this->currentZ, $create);
if($this->currentChunk === null){ if($this->currentChunk === null){
return false; return false;
} }
@ -66,7 +63,7 @@ class SubChunkIteratorManager{
if($this->currentSubChunk === null or $this->currentY !== ($y >> 4)){ if($this->currentSubChunk === null or $this->currentY !== ($y >> 4)){
$this->currentY = $y >> 4; $this->currentY = $y >> 4;
$this->currentSubChunk = $this->currentChunk->getSubChunk($y >> 4, $this->allocateEmptySubs); $this->currentSubChunk = $this->currentChunk->getSubChunk($y >> 4, $create);
if($this->currentSubChunk instanceof EmptySubChunk){ if($this->currentSubChunk instanceof EmptySubChunk){
return false; return false;
} }