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

Fixed precondition on double chunk send being useless

Browse Source 
this is messy, but necessary for now.
This commit is contained in:
Dylan K. Taylor
2021-04-19 00:46:27 +01:00
parent d19c21e2e1
commit 09a2402f01
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/player/Player.php
View File

@ -744,13 +744,6 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$this->usedChunks[$index] = UsedChunkStatus::REQUESTED();
$this->getNetworkSession()->startUsingChunk($X, $Z, function() use ($X, $Z, $index) : void{
if(!$this->usedChunks[$index]->equals(UsedChunkStatus::REQUESTED())){
//TODO: make this an error
//this could be triggered due to the shitty way that chunk resends are handled
//right now - not because of the spammy re-requesting, but because the chunk status reverts
//to NEEDED if they want to be resent.
return;
}
$this->usedChunks[$index] = UsedChunkStatus::SENT();
if($this->spawnChunkLoadCount === -1){
$this->spawnEntitiesOnChunk($X, $Z);
@ -876,6 +869,13 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
return $this->usedChunks;
}
/**
* Returns a usage status of the given chunk, or null if the player is not using the given chunk.
*/
public function getUsedChunkStatus(int $chunkX, int $chunkZ) : ?UsedChunkStatus{
return $this->usedChunks[World::chunkHash($chunkX, $chunkZ)] ?? null;
}
/**
* Returns whether the target chunk has been sent to this player.
*/