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

Added debug messages for resource requests with invalid pack IDs

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-03-11 11:19:14 +00:00
parent e1fb4a44e9
commit ed765a2c9b
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pocketmine/Player.php
View File

@ -1994,6 +1994,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
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->close("", "disconnectionScreen.resourcePack", true); $this->close("", "disconnectionScreen.resourcePack", true);
$this->server->getLogger()->debug("Got a resource pack request for unknown pack with UUID " . $uuid . ", available packs: " . implode(", ", $manager->getPackIdList()));
break; break;
} }
@ -3320,6 +3321,8 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$pack = $manager->getPackById($packet->packId); $pack = $manager->getPackById($packet->packId);
if(!($pack instanceof ResourcePack)){ if(!($pack instanceof ResourcePack)){
$this->close("", "disconnectionScreen.resourcePack", true); $this->close("", "disconnectionScreen.resourcePack", true);
$this->server->getLogger()->debug("Got a resource pack chunk request for unknown pack with UUID " . $uuid . ", available packs: " . implode(", ", $manager->getPackIdList()));
return true; return true;
} }

7
src/pocketmine/resourcepacks/ResourcePackManager.php
View File

@ -126,4 +126,11 @@ class ResourcePackManager{
public function getPackById(string $id){ public function getPackById(string $id){
return $this->uuidList[$id] ?? null; return $this->uuidList[$id] ?? null;
} }
/**
* @return string[]
*/
public function getPackIdList() : array{
return array_keys($this->uuidList);
}
} }