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

Fixed infinite recursion when setting a block on an EmptyChunkSection

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-08-19 11:37:02 +02:00
parent 5c150f696c
commit b66f49dc5e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/level/format/generic/BaseChunk.php
View File

@ -152,7 +152,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
return $this->sections[$y >> 4]->setBlock($x, $y & 0x0f, $z, $blockId & 0xff, $meta & 0x0f);
}catch(\Exception $e){
$level = $this->getProvider();
$this->setSection($Y = $y >> 4, $level::createChunkSection($Y));
$this->setInternalSection($Y = $y >> 4, $level::createChunkSection($Y));
return $this->setBlock($x, $y, $z, $blockId, $meta);
}
}
@ -166,7 +166,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
$this->sections[$y >> 4]->setBlockId($x, $y & 0x0f, $z, $id);
}catch(\Exception $e){
$level = $this->getProvider();
$this->setSection($Y = $y >> 4, $level::createChunkSection($Y));
$this->setInternalSection($Y = $y >> 4, $level::createChunkSection($Y));
$this->setBlockId($x, $y, $z, $id);
}
}
@ -180,7 +180,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
$this->sections[$y >> 4]->setBlockData($x, $y & 0x0f, $z, $data);
}catch(\Exception $e){
$level = $this->getProvider();
$this->setSection($Y = $y >> 4, $level::createChunkSection($Y));
$this->setInternalSection($Y = $y >> 4, $level::createChunkSection($Y));
$this->setBlockData($x, $y, $z, $data);
}
}
@ -194,7 +194,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
$this->sections[$y >> 4]->getBlockSkyLight($x, $y & 0x0f, $z, $data);
}catch(\Exception $e){
$level = $this->getProvider();
$this->setSection($Y = $y >> 4, $level::createChunkSection($Y));
$this->setInternalSection($Y = $y >> 4, $level::createChunkSection($Y));
$this->setBlockSkyLight($x, $y, $z, $data);
}
}
@ -208,7 +208,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
$this->sections[$y >> 4]->getBlockSkyLight($x, $y & 0x0f, $z, $data);
}catch(\Exception $e){
$level = $this->getProvider();
$this->setSection($Y = $y >> 4, $level::createChunkSection($Y));
$this->setInternalSection($Y = $y >> 4, $level::createChunkSection($Y));
$this->setBlockLight($x, $y, $z, $data);
}
}
@ -261,6 +261,10 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
}
}
private function setInternalSection($fY, ChunkSection $section){
$this->sections[(int) $fY] = $section;
}
public function load($generate = true){
return $this->getProvider() === null ? false : $this->getProvider()->getChunk($this->getX(), $this->getZ(), true) instanceof Chunk;
}