From ed765a2c9bddd7d8ee60735b6df86628c5140e2b Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 11 Mar 2017 11:19:14 +0000 Subject: [PATCH] Added debug messages for resource requests with invalid pack IDs --- src/pocketmine/Player.php | 3 +++ src/pocketmine/resourcepacks/ResourcePackManager.php | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 42b21d623..28d0b8317 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -1994,6 +1994,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade if(!($pack instanceof ResourcePack)){ //Client requested a resource pack but we don't have it available on the server $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; } @@ -3320,6 +3321,8 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade $pack = $manager->getPackById($packet->packId); if(!($pack instanceof ResourcePack)){ $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; } diff --git a/src/pocketmine/resourcepacks/ResourcePackManager.php b/src/pocketmine/resourcepacks/ResourcePackManager.php index 7ec44bed0..97ab8130e 100644 --- a/src/pocketmine/resourcepacks/ResourcePackManager.php +++ b/src/pocketmine/resourcepacks/ResourcePackManager.php @@ -126,4 +126,11 @@ class ResourcePackManager{ public function getPackById(string $id){ return $this->uuidList[$id] ?? null; } + + /** + * @return string[] + */ + public function getPackIdList() : array{ + return array_keys($this->uuidList); + } } \ No newline at end of file