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

Revert "Revert "Player: do not re-request the same ungenerated chunks multiple times""

Browse Source 
This reverts commit 3265d3f6b4.
This commit is contained in:
Dylan K. Taylor
2021-10-31 22:57:56 +00:00
parent 96cfdc79b8
commit bd60e41268
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/player/Player.php
View File

@ -676,7 +676,8 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
++$count;
$this->usedChunks[$index] = UsedChunkStatus::NEEDED();
$this->usedChunks[$index] = UsedChunkStatus::REQUESTED_GENERATION();
unset($this->loadQueue[$index]);
$this->getWorld()->registerChunkLoader($this->chunkLoader, $X, $Z, true);
$this->getWorld()->registerChunkListener($this, $X, $Z);
@ -685,15 +686,10 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
if(!$this->isConnected() || !isset($this->usedChunks[$index]) || $world !== $this->getWorld()){
return;
}
if(!$this->usedChunks[$index]->equals(UsedChunkStatus::NEEDED())){
//TODO: make this an error
//we may have added multiple completion handlers, since the Player keeps re-requesting chunks
//it doesn't have yet (a relic from the old system, but also currently relied on for chunk resends).
//in this event, make sure we don't try to send the chunk multiple times.
return;
if(!$this->usedChunks[$index]->equals(UsedChunkStatus::REQUESTED_GENERATION())){
throw new AssumptionFailedError("Used chunk status should not have changed while in REQUESTED_GENERATION mode");
}
unset($this->loadQueue[$index]);
$this->usedChunks[$index] = UsedChunkStatus::REQUESTED();
$this->usedChunks[$index] = UsedChunkStatus::REQUESTED_SENDING();
$this->getNetworkSession()->startUsingChunk($X, $Z, function() use ($X, $Z, $index) : void{
$this->usedChunks[$index] = UsedChunkStatus::SENT();