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

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

Browse Source 
This reverts commit 866020dfdb06434b4f361a4a0f0faf7a89c30ed2.

For some fucking reason this broke resending chunks in some cases (and
sending chunks at all in others). I don't have time to debug this right
now, so it's going to have to remain broken, infuriatingly enough.
This commit is contained in:
Dylan K. Taylor 2021-10-31 21:23:36 +00:00
parent 0f78a2b5ef
commit 3265d3f6b4
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -924,7 +924,7 @@ class NetworkSession{
$this->logger->debug("Tried to send no-longer-active chunk $chunkX $chunkZ in world " . $world->getFolderName());
return;
}
if(!$status->equals(UsedChunkStatus::REQUESTED_SENDING())){
if(!$status->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

14
src/player/Player.php
View File

@ -676,8 +676,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
++$count;
$this->usedChunks[$index] = UsedChunkStatus::REQUESTED_GENERATION();
unset($this->loadQueue[$index]);
$this->usedChunks[$index] = UsedChunkStatus::NEEDED();
$this->getWorld()->registerChunkLoader($this->chunkLoader, $X, $Z, true);
$this->getWorld()->registerChunkListener($this, $X, $Z);
@ -686,10 +685,15 @@ 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::REQUESTED_GENERATION())){
throw new AssumptionFailedError("Used chunk status should not have changed while in REQUESTED_GENERATION mode");
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;
}
$this->usedChunks[$index] = UsedChunkStatus::REQUESTED_SENDING();
unset($this->loadQueue[$index]);
$this->usedChunks[$index] = UsedChunkStatus::REQUESTED();
$this->getNetworkSession()->startUsingChunk($X, $Z, function() use ($X, $Z, $index) : void{
$this->usedChunks[$index] = UsedChunkStatus::SENT();

6
src/player/UsedChunkStatus.php
View File

@ -32,8 +32,7 @@ use pocketmine\utils\EnumTrait;
* @generate-registry-docblock
*
* @method static UsedChunkStatus NEEDED()
* @method static UsedChunkStatus REQUESTED_GENERATION()
* @method static UsedChunkStatus REQUESTED_SENDING()
* @method static UsedChunkStatus REQUESTED()
* @method static UsedChunkStatus SENT()
*/
final class UsedChunkStatus{
@ -42,8 +41,7 @@ final class UsedChunkStatus{
protected static function setup() : void{
self::registerAll(
new self("NEEDED"),
new self("REQUESTED_GENERATION"),
new self("REQUESTED_SENDING"),
new self("REQUESTED"),
new self("SENT")
);
}