Fix height limits on subchunks, fixed #196

facepalm
This commit is contained in:
Dylan K. Taylor 2016-12-21 23:41:46 +00:00
parent 9e938baea0
commit 363b24c663

View File

@ -554,7 +554,7 @@ class GenericChunk implements Chunk{
} }
public function getSubChunk(int $fY, bool $generateNew = false) : SubChunk{ public function getSubChunk(int $fY, bool $generateNew = false) : SubChunk{
if($fY < 0 or $fY >= self::MAX_SUBCHUNKS){ if($fY < 0 or $fY >= $this->height){
return new EmptySubChunk($fY); return new EmptySubChunk($fY);
}elseif($generateNew and $this->subChunks[$fY] instanceof EmptySubChunk){ }elseif($generateNew and $this->subChunks[$fY] instanceof EmptySubChunk){
$this->subChunks[$fY] = new SubChunk($fY); $this->subChunks[$fY] = new SubChunk($fY);
@ -563,7 +563,7 @@ class GenericChunk implements Chunk{
} }
public function setSubChunk(int $fY, SubChunk $subChunk = null, bool $allowEmpty = false) : bool{ public function setSubChunk(int $fY, SubChunk $subChunk = null, bool $allowEmpty = false) : bool{
if($fY < 0 or $fY >= self::MAX_SUBCHUNKS){ if($fY < 0 or $fY >= $this->height){
return false; return false;
} }
if($subChunk === null or ($subChunk->isEmpty() and !$allowEmpty)){ if($subChunk === null or ($subChunk->isEmpty() and !$allowEmpty)){
@ -597,7 +597,7 @@ class GenericChunk implements Chunk{
public function pruneEmptySubChunks(){ public function pruneEmptySubChunks(){
foreach($this->subChunks as $y => $subChunk){ foreach($this->subChunks as $y => $subChunk){
if($y < 0 or $y > self::MAX_SUBCHUNKS){ if($y < 0 or $y >= $this->height){
assert(false, "Invalid subchunk index"); assert(false, "Invalid subchunk index");
unset($this->subChunks[$y]); unset($this->subChunks[$y]);
}elseif($subChunk instanceof EmptySubChunk){ }elseif($subChunk instanceof EmptySubChunk){