mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 17:59:48 +00:00
Code Issues Projects Releases Wiki Activity

Be less dependent on AsyncTask->onCompletion() Server parameter

Browse Source 
this is going to get removed soon.
This commit is contained in:
Dylan K. Taylor
2018-08-04 15:56:14 +01:00
parent 779d92c656
commit 20f3b82d52
6 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pocketmine/network/mcpe/ChunkRequestTask.php
View File

@ -31,8 +31,6 @@ use pocketmine\Server;
use pocketmine\tile\Spawnable;
class ChunkRequestTask extends AsyncTask{
/** @var int */
protected $levelId;
/** @var string */
protected $chunk;
/** @var int */
@ -45,7 +43,7 @@ class ChunkRequestTask extends AsyncTask{
protected $compressionLevel;
public function __construct(Level $level, int $chunkX, int $chunkZ, Chunk $chunk){
$this->levelId = $level->getId();
$this->storeLocal($level);
$this->compressionLevel = NetworkCompression::$LEVEL;
$this->chunk = $chunk->fastSerialize();
@ -78,15 +76,14 @@ class ChunkRequestTask extends AsyncTask{
}
public function onCompletion(Server $server) : void{
$level = $server->getLevel($this->levelId);
if($level instanceof Level){
/** @var Level $level */
$level = $this->fetchLocal();
if(!$level->isClosed()){
if($this->hasResult()){
$level->chunkRequestCallback($this->chunkX, $this->chunkZ, $this->getResult());
}else{
$server->getLogger()->error("Chunk request for level #" . $this->levelId . ", x=" . $this->chunkX . ", z=" . $this->chunkZ . " doesn't have any result data");
$level->getServer()->getLogger()->error("Chunk request for level " . $level->getName() . ", x=" . $this->chunkX . ", z=" . $this->chunkZ . " doesn't have any result data");
}
}else{
$server->getLogger()->debug("Dropped chunk task due to level not loaded");
}
}
}