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

Chunk: remove useless field "height"

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-10-22 21:15:46 +01:00
parent 295d14e0d9
commit b7d1d11eb4
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/world/format/Chunk.php
View File

@ -68,9 +68,6 @@ class Chunk{
/** @var bool */ /** @var bool */
protected $terrainPopulated = false; protected $terrainPopulated = false;
/** @var int */
protected $height = Chunk::MAX_SUBCHUNKS;
/** @var \SplFixedArray|SubChunkInterface[] */ /** @var \SplFixedArray|SubChunkInterface[] */
protected $subChunks; protected $subChunks;
@ -105,9 +102,7 @@ class Chunk{
$this->x = $chunkX; $this->x = $chunkX;
$this->z = $chunkZ; $this->z = $chunkZ;
$this->height = Chunk::MAX_SUBCHUNKS; //TODO: add a way of changing this $this->subChunks = new \SplFixedArray(Chunk::MAX_SUBCHUNKS);
$this->subChunks = new \SplFixedArray($this->height);
foreach($this->subChunks as $y => $null){ foreach($this->subChunks as $y => $null){
$this->subChunks[$y] = $subChunks[$y] ?? EmptySubChunk::getInstance(); $this->subChunks[$y] = $subChunks[$y] ?? EmptySubChunk::getInstance();
@ -117,7 +112,7 @@ class Chunk{
$this->heightMap = \SplFixedArray::fromArray($heightMap); $this->heightMap = \SplFixedArray::fromArray($heightMap);
}else{ }else{
assert(count($heightMap) === 0, "Wrong HeightMap value count, expected 256, got " . count($heightMap)); assert(count($heightMap) === 0, "Wrong HeightMap value count, expected 256, got " . count($heightMap));
$val = ($this->height * 16); $val = ($this->subChunks->getSize() * 16);
$this->heightMap = \SplFixedArray::fromArray(array_fill(0, 256, $val)); $this->heightMap = \SplFixedArray::fromArray(array_fill(0, 256, $val));
} }
@ -163,7 +158,7 @@ class Chunk{
* @return int * @return int
*/ */
public function getHeight() : int{ public function getHeight() : int{
return $this->height; return $this->subChunks->getSize();
} }
/** /**
@ -670,7 +665,7 @@ class Chunk{
* @return SubChunkInterface * @return SubChunkInterface
*/ */
public function getSubChunk(int $y, bool $generateNew = false) : SubChunkInterface{ public function getSubChunk(int $y, bool $generateNew = false) : SubChunkInterface{
if($y < 0 or $y >= $this->height){ if($y < 0 or $y >= $this->subChunks->getSize()){
return EmptySubChunk::getInstance(); return EmptySubChunk::getInstance();
}elseif($generateNew and $this->subChunks[$y] instanceof EmptySubChunk){ }elseif($generateNew and $this->subChunks[$y] instanceof EmptySubChunk){
$this->subChunks[$y] = new SubChunk(BlockLegacyIds::AIR << 4, []); $this->subChunks[$y] = new SubChunk(BlockLegacyIds::AIR << 4, []);
@ -687,7 +682,7 @@ class Chunk{
* @param bool $allowEmpty Whether to check if the chunk is empty, and if so replace it with an empty stub * @param bool $allowEmpty Whether to check if the chunk is empty, and if so replace it with an empty stub
*/ */
public function setSubChunk(int $y, ?SubChunkInterface $subChunk, bool $allowEmpty = false) : void{ public function setSubChunk(int $y, ?SubChunkInterface $subChunk, bool $allowEmpty = false) : void{
if($y < 0 or $y >= $this->height){ if($y < 0 or $y >= $this->subChunks->getSize()){
throw new \InvalidArgumentException("Invalid subchunk Y coordinate $y"); throw new \InvalidArgumentException("Invalid subchunk Y coordinate $y");
} }
if($subChunk === null or ($subChunk->isEmpty() and !$allowEmpty)){ if($subChunk === null or ($subChunk->isEmpty() and !$allowEmpty)){