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

SubChunkExplorer: avoid repeated shift-right instructions

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-03-25 23:36:10 +00:00
parent 5e9ce92b55
commit 64886707b2
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/world/utils/SubChunkExplorer.php
View File

@ -51,9 +51,11 @@ class SubChunkExplorer{
* @phpstan-return SubChunkExplorerStatus::* * @phpstan-return SubChunkExplorerStatus::*
*/ */
public function moveTo(int $x, int $y, int $z) : int{ public function moveTo(int $x, int $y, int $z) : int{
if($this->currentChunk === null or $this->currentX !== ($x >> 4) or $this->currentZ !== ($z >> 4)){ $newChunkX = $x >> 4;
$this->currentX = $x >> 4; $newChunkZ = $z >> 4;
$this->currentZ = $z >> 4; if($this->currentChunk === null or $this->currentX !== $newChunkX or $this->currentZ !== $newChunkZ){
$this->currentX = $newChunkX;
$this->currentZ = $newChunkZ;
$this->currentSubChunk = null; $this->currentSubChunk = null;
$this->currentChunk = $this->world->getChunk($this->currentX, $this->currentZ); $this->currentChunk = $this->world->getChunk($this->currentX, $this->currentZ);
@ -62,15 +64,16 @@ class SubChunkExplorer{
} }
} }
if($this->currentSubChunk === null or $this->currentY !== ($y >> 4)){ $newChunkY = $y >> 4;
$this->currentY = $y >> 4; if($this->currentSubChunk === null or $this->currentY !== $newChunkY){
$this->currentY = $newChunkY;
if($this->currentY < 0 or $this->currentY >= $this->currentChunk->getHeight()){ if($this->currentY < 0 or $this->currentY >= $this->currentChunk->getHeight()){
$this->currentSubChunk = null; $this->currentSubChunk = null;
return SubChunkExplorerStatus::INVALID; return SubChunkExplorerStatus::INVALID;
} }
$this->currentSubChunk = $this->currentChunk->getSubChunk($y >> 4); $this->currentSubChunk = $this->currentChunk->getSubChunk($newChunkY);
return SubChunkExplorerStatus::MOVED; return SubChunkExplorerStatus::MOVED;
} }