mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-15 02:09:42 +00:00
Code Issues Projects Releases Wiki Activity

ResourcePacksSessionHandler: clean up error reporting

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-21 14:44:54 +01:00
parent da876cc8f3
commit 7d8624b12f
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/pocketmine/network/mcpe/handler/ResourcePacksSessionHandler.php
View File

@ -64,6 +64,11 @@ class ResourcePacksSessionHandler extends SessionHandler{
$this->session->sendDataPacket($pk); $this->session->sendDataPacket($pk);
} }
private function disconnectWithError(string $error) : void{
$this->player->getServer()->getLogger()->error("Error while downloading resource packs for " . $this->player->getName() . ": " . $error);
$this->player->close("", "%disconnectionScreen.resourcePack", true);
}
public function handleResourcePackClientResponse(ResourcePackClientResponsePacket $packet) : bool{ public function handleResourcePackClientResponse(ResourcePackClientResponsePacket $packet) : bool{
switch($packet->status){ switch($packet->status){
case ResourcePackClientResponsePacket::STATUS_REFUSED: case ResourcePackClientResponsePacket::STATUS_REFUSED:
@ -75,9 +80,7 @@ class ResourcePacksSessionHandler extends SessionHandler{
$pack = $this->resourcePackManager->getPackById($uuid); $pack = $this->resourcePackManager->getPackById($uuid);
if(!($pack instanceof ResourcePack)){ if(!($pack instanceof ResourcePack)){
//Client requested a resource pack but we don't have it available on the server //Client requested a resource pack but we don't have it available on the server
$this->player->close("", "disconnectionScreen.resourcePack", true); $this->disconnectWithError("Unknown pack $uuid requested, available packs: " . implode(", ", $this->resourcePackManager->getPackIdList()));
$this->player->getServer()->getLogger()->debug("Got a resource pack request for unknown pack with UUID " . $uuid . ", available packs: " . implode(", ", $this->resourcePackManager->getPackIdList()));
return false; return false;
} }
@ -110,26 +113,20 @@ class ResourcePacksSessionHandler extends SessionHandler{
public function handleResourcePackChunkRequest(ResourcePackChunkRequestPacket $packet) : bool{ public function handleResourcePackChunkRequest(ResourcePackChunkRequestPacket $packet) : bool{
$pack = $this->resourcePackManager->getPackById($packet->packId); $pack = $this->resourcePackManager->getPackById($packet->packId);
if(!($pack instanceof ResourcePack)){ if(!($pack instanceof ResourcePack)){
$this->player->close("", "disconnectionScreen.resourcePack", true); $this->disconnectWithError("Invalid request for chunk $packet->chunkIndex of unknown pack $packet->packId, available packs: " . implode(", ", $this->resourcePackManager->getPackIdList()));
$this->player->getServer()->getLogger()->debug("Got a resource pack chunk request for unknown pack with UUID " . $packet->packId . ", available packs: " . implode(", ", $this->resourcePackManager->getPackIdList()));
return false; return false;
} }
$packId = $pack->getPackId(); //use this because case may be different $packId = $pack->getPackId(); //use this because case may be different
if(isset($this->downloadedChunks[$packId][$packet->chunkIndex])){ if(isset($this->downloadedChunks[$packId][$packet->chunkIndex])){
$this->player->close("", "disconnectionScreen.resourcePack", true); $this->disconnectWithError("Duplicate request for chunk $packet->chunkIndex of pack $packet->packId");
$this->player->getServer()->getLogger()->debug("Got a duplicate resource pack chunk request for pack " . $packet->packId . " chunk $packet->chunkIndex");
return false; return false;
} }
$offset = $packet->chunkIndex * self::PACK_CHUNK_SIZE; $offset = $packet->chunkIndex * self::PACK_CHUNK_SIZE;
if($offset < 0 or $offset >= $pack->getPackSize()){ if($offset < 0 or $offset >= $pack->getPackSize()){
$this->player->close("", "disconnectionScreen.resourcePack", true); $this->disconnectWithError("Invalid out-of-bounds request for chunk $packet->chunkIndex of $packet->packId: offset $offset, file size " . $pack->getPackSize());
$this->player->getServer()->getLogger()->debug("Got a resource pack chunk request with invalid start offset $offset, file size is " . $pack->getPackSize());
return false; return false;
} }