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

remove a couple more Position->getWorld() usages

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-05-19 21:38:51 +01:00
parent 81dff6d4c5
commit 3f1f135a59
4 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/mcpe/NetworkSession.php
View File

@@ -805,8 +805,7 @@ class NetworkSession{
public function startUsingChunk(int $chunkX, int $chunkZ, \Closure $onCompletion) : void{
Utils::validateCallableSignature(function(int $chunkX, int $chunkZ) : void{}, $onCompletion);
$world = $this->player->getLocation()->getWorld();
assert($world !== null);
$world = $this->player->getLocation()->getWorldNonNull();
ChunkCache::getInstance($world, $this->compressor)->request($chunkX, $chunkZ)->onResolve(
//this callback may be called synchronously or asynchronously, depending on whether the promise is resolved yet
@@ -814,7 +813,7 @@ class NetworkSession{
if(!$this->isConnected()){
return;
}
$currentWorld = $this->player->getLocation()->getWorld();
$currentWorld = $this->player->getLocation()->getWorldNonNull();
if($world !== $currentWorld or !$this->player->isUsingChunk($chunkX, $chunkZ)){
$this->logger->debug("Tried to send no-longer-active chunk $chunkX $chunkZ in world " . $world->getFolderName());
return;