Merge branch '3.5'

This commit is contained in:
Dylan K. Taylor
2019-01-04 00:37:48 +00:00
9 changed files with 49 additions and 30 deletions

View File

@ -678,7 +678,9 @@ class Level implements ChunkManager, Metadatable{
}
public function unregisterChunkLoader(ChunkLoader $loader, int $chunkX, int $chunkZ){
if(isset($this->chunkLoaders[$index = Level::chunkHash($chunkX, $chunkZ)][$hash = $loader->getLoaderId()])){
$index = Level::chunkHash($chunkX, $chunkZ);
$hash = $loader->getLoaderId();
if(isset($this->chunkLoaders[$index][$hash])){
unset($this->chunkLoaders[$index][$hash]);
unset($this->playerLoaders[$index][$hash]);
if(count($this->chunkLoaders[$index]) === 0){
@ -1306,9 +1308,9 @@ class Level implements ChunkManager, Metadatable{
}
/**
* @param $x
* @param $y
* @param $z
* @param int $x
* @param int $y
* @param int $z
*
* @return int bitmap, (id << 4) | data
*/