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

Level: make use of fromFullState() in getBlockAt()

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-12-04 22:05:00 +00:00
parent 47e62b1b38
commit 8dd2ea22b8
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/level/Level.php
View File

@ -1345,8 +1345,7 @@ class Level implements ChunkManager, Metadatable{
* @return Block * @return Block
*/ */
public function getBlockAt(int $x, int $y, int $z, bool $cached = true, bool $addToCache = true) : Block{ public function getBlockAt(int $x, int $y, int $z, bool $cached = true, bool $addToCache = true) : Block{
$id = 0; $fullState = 0;
$meta = 0;
$blockHash = null; $blockHash = null;
$chunkHash = Level::chunkHash($x >> 4, $z >> 4); $chunkHash = Level::chunkHash($x >> 4, $z >> 4);
@ -1360,14 +1359,12 @@ class Level implements ChunkManager, Metadatable{
$chunk = $this->chunks[$chunkHash] ?? null; $chunk = $this->chunks[$chunkHash] ?? null;
if($chunk !== null){ if($chunk !== null){
$fullState = $chunk->getFullBlock($x & 0x0f, $y, $z & 0x0f); $fullState = $chunk->getFullBlock($x & 0x0f, $y, $z & 0x0f);
$id = $fullState >> 4;
$meta = $fullState & 0xf;
}else{ }else{
$addToCache = false; $addToCache = false;
} }
} }
$block = BlockFactory::get($id, $meta); $block = BlockFactory::fromFullBlock($fullState);
$block->position($this, $x, $y, $z); $block->position($this, $x, $y, $z);
static $dynamicStateRead = false; static $dynamicStateRead = false;