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

Merge branch '3.5'

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-01-25 13:19:40 +00:00
commit 8a0f5cd7c9
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,6 +292,19 @@ class Level implements ChunkManager, Metadatable{
return (($x & 0xFFFFFFF) << 36) | (($y & Level::Y_MASK) << 28) | ($z & 0xFFFFFFF); return (($x & 0xFFFFFFF) << 36) | (($y & Level::Y_MASK) << 28) | ($z & 0xFFFFFFF);
} }
/**
* Computes a small index relative to chunk base from the given coordinates.
*
* @param int $x
* @param int $y
* @param int $z
*
* @return int
*/
public static function chunkBlockHash(int $x, int $y, int $z) : int{
return ($y << 8) | (($z & 0xf) << 4) | ($x & 0xf);
}
public static function getBlockXYZ(int $hash, ?int &$x, ?int &$y, ?int &$z) : void{ public static function getBlockXYZ(int $hash, ?int &$x, ?int &$y, ?int &$z) : void{
$x = $hash >> 36; $x = $hash >> 36;
$y = ($hash >> 28) & Level::Y_MASK; //it's always positive $y = ($hash >> 28) & Level::Y_MASK; //it's always positive
@ -1340,14 +1353,14 @@ class Level implements ChunkManager, Metadatable{
*/ */
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{
$fullState = 0; $fullState = 0;
$blockHash = null; $relativeBlockHash = null;
$chunkHash = Level::chunkHash($x >> 4, $z >> 4); $chunkHash = Level::chunkHash($x >> 4, $z >> 4);
if($this->isInWorld($x, $y, $z)){ if($this->isInWorld($x, $y, $z)){
$blockHash = Level::blockHash($x, $y, $z); $relativeBlockHash = Level::chunkBlockHash($x, $y, $z);
if($cached and isset($this->blockCache[$chunkHash][$blockHash])){ if($cached and isset($this->blockCache[$chunkHash][$relativeBlockHash])){
return $this->blockCache[$chunkHash][$blockHash]; return $this->blockCache[$chunkHash][$relativeBlockHash];
} }
$chunk = $this->chunks[$chunkHash] ?? null; $chunk = $this->chunks[$chunkHash] ?? null;
@ -1374,8 +1387,8 @@ class Level implements ChunkManager, Metadatable{
$dynamicStateRead = false; $dynamicStateRead = false;
} }
if($addToCache and $blockHash !== null){ if($addToCache and $relativeBlockHash !== null){
$this->blockCache[$chunkHash][$blockHash] = $block; $this->blockCache[$chunkHash][$relativeBlockHash] = $block;
} }
return $block; return $block;
@ -1539,14 +1552,14 @@ class Level implements ChunkManager, Metadatable{
$block->writeStateToWorld(); $block->writeStateToWorld();
$chunkHash = Level::chunkHash($x >> 4, $z >> 4); $chunkHash = Level::chunkHash($x >> 4, $z >> 4);
$blockHash = Level::blockHash($x, $y, $z); $relativeBlockHash = Level::chunkBlockHash($x, $y, $z);
unset($this->blockCache[$chunkHash][$blockHash]); unset($this->blockCache[$chunkHash][$relativeBlockHash]);
if(!isset($this->changedBlocks[$chunkHash])){ if(!isset($this->changedBlocks[$chunkHash])){
$this->changedBlocks[$chunkHash] = []; $this->changedBlocks[$chunkHash] = [];
} }
$this->changedBlocks[$chunkHash][$blockHash] = $block; $this->changedBlocks[$chunkHash][$relativeBlockHash] = $block;
foreach($this->getChunkLoaders($x >> 4, $z >> 4) as $loader){ foreach($this->getChunkLoaders($x >> 4, $z >> 4) as $loader){
$loader->onBlockChanged($block); $loader->onBlockChanged($block);