Fixed precondition on double chunk send being useless

this is messy, but necessary for now.

Author: dktapps

src/network/mcpe/NetworkSession.php

@@ -102,6 +102,7 @@
 use pocketmine\player\GameMode;
 use pocketmine\player\Player;
 use pocketmine\player\PlayerInfo;
+use pocketmine\player\UsedChunkStatus;
 use pocketmine\player\XboxLivePlayerInfo;
 use pocketmine\Server;
 use pocketmine\timings\Timings;
@@ -919,10 +920,17 @@ function(CompressBatchPromise $promise) use ($world, $onCompletion, $chunkX, $ch
 					return;
 				}
 				$currentWorld = $this->player->getLocation()->getWorld();
-				if($world !== $currentWorld or !$this->player->isUsingChunk($chunkX, $chunkZ)){
+				if($world !== $currentWorld or ($status = $this->player->getUsedChunkStatus($chunkX, $chunkZ)) === null){
 					$this->logger->debug("Tried to send no-longer-active chunk $chunkX $chunkZ in world " . $world->getFolderName());
 					return;
 				}
+				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
+					//to NEEDED if they want to be resent.
+					return;
+				}
 				$world->timings->syncChunkSend->startTiming();
 				try{
 					$this->queueCompressed($promise);

src/player/Player.php

@@ -744,13 +744,6 @@ function() use ($X, $Z, $index, $world) : void{
 					$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 @@ public function getUsedChunks() : array{
 		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.
 	 */