From 6b773dc04d103f1541d81afe9fc80c1b5b03e688 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Thu, 13 Jul 2017 10:55:42 +0100
Subject: [PATCH] Make resource-pack error messages a little clearer

---
 src/pocketmine/resourcepacks/ZippedResourcePack.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pocketmine/resourcepacks/ZippedResourcePack.php b/src/pocketmine/resourcepacks/ZippedResourcePack.php
index 99e865f5d..403c410f2 100644
--- a/src/pocketmine/resourcepacks/ZippedResourcePack.php
+++ b/src/pocketmine/resourcepacks/ZippedResourcePack.php
@@ -76,7 +76,11 @@ class ZippedResourcePack implements ResourcePack{
 		}
 
 		if(($manifestData = $archive->getFromName("manifest.json")) === false){
-			throw new \InvalidStateException("Could not load resource pack from $zipPath: manifest.json not found");
+			if($archive->locateName("pack_manifest.json") !== false){
+				throw new \InvalidStateException("Could not load resource pack from $zipPath: unsupported old pack format");
+			}else{
+				throw new \InvalidStateException("Could not load resource pack from $zipPath: manifest.json not found in the archive root");
+			}
 		}
 
 		$archive->close();