mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-11 16:29:40 +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 17:12:00 +00:00
commit bb27c76d13
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -642,25 +642,25 @@ class Level implements ChunkManager, Metadatable{
} }
public function registerChunkLoader(ChunkLoader $loader, int $chunkX, int $chunkZ, bool $autoLoad = true){ public function registerChunkLoader(ChunkLoader $loader, int $chunkX, int $chunkZ, bool $autoLoad = true){
$hash = $loader->getLoaderId(); $loaderId = $loader->getLoaderId();
if(!isset($this->chunkLoaders[$index = Level::chunkHash($chunkX, $chunkZ)])){ if(!isset($this->chunkLoaders[$chunkHash = Level::chunkHash($chunkX, $chunkZ)])){
$this->chunkLoaders[$index] = []; $this->chunkLoaders[$chunkHash] = [];
$this->playerLoaders[$index] = []; $this->playerLoaders[$chunkHash] = [];
}elseif(isset($this->chunkLoaders[$index][$hash])){ }elseif(isset($this->chunkLoaders[$chunkHash][$loaderId])){
return; return;
} }
$this->chunkLoaders[$index][$hash] = $loader; $this->chunkLoaders[$chunkHash][$loaderId] = $loader;
if($loader instanceof Player){ if($loader instanceof Player){
$this->playerLoaders[$index][$hash] = $loader; $this->playerLoaders[$chunkHash][$loaderId] = $loader;
} }
if(!isset($this->loaders[$hash])){ if(!isset($this->loaders[$loaderId])){
$this->loaderCounter[$hash] = 1; $this->loaderCounter[$loaderId] = 1;
$this->loaders[$hash] = $loader; $this->loaders[$loaderId] = $loader;
}else{ }else{
++$this->loaderCounter[$hash]; ++$this->loaderCounter[$loaderId];
} }
$this->cancelUnloadChunkRequest($chunkX, $chunkZ); $this->cancelUnloadChunkRequest($chunkX, $chunkZ);
@ -671,20 +671,20 @@ class Level implements ChunkManager, Metadatable{
} }
public function unregisterChunkLoader(ChunkLoader $loader, int $chunkX, int $chunkZ){ public function unregisterChunkLoader(ChunkLoader $loader, int $chunkX, int $chunkZ){
$index = Level::chunkHash($chunkX, $chunkZ); $chunkHash = Level::chunkHash($chunkX, $chunkZ);
$hash = $loader->getLoaderId(); $loaderId = $loader->getLoaderId();
if(isset($this->chunkLoaders[$index][$hash])){ if(isset($this->chunkLoaders[$chunkHash][$loaderId])){
unset($this->chunkLoaders[$index][$hash]); unset($this->chunkLoaders[$chunkHash][$loaderId]);
unset($this->playerLoaders[$index][$hash]); unset($this->playerLoaders[$chunkHash][$loaderId]);
if(count($this->chunkLoaders[$index]) === 0){ if(count($this->chunkLoaders[$chunkHash]) === 0){
unset($this->chunkLoaders[$index]); unset($this->chunkLoaders[$chunkHash]);
unset($this->playerLoaders[$index]); unset($this->playerLoaders[$chunkHash]);
$this->unloadChunkRequest($chunkX, $chunkZ, true); $this->unloadChunkRequest($chunkX, $chunkZ, true);
} }
if(--$this->loaderCounter[$hash] === 0){ if(--$this->loaderCounter[$loaderId] === 0){
unset($this->loaderCounter[$hash]); unset($this->loaderCounter[$loaderId]);
unset($this->loaders[$hash]); unset($this->loaders[$loaderId]);
} }
} }
} }