From c81b76cbf6ec851742e021e38fd2e01e7ece7334 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Fri, 1 Sep 2017 18:52:55 +0100
Subject: [PATCH] Make plugin load errors more descriptive

---
 src/pocketmine/lang/locale              |  2 +-
 src/pocketmine/plugin/PluginManager.php | 25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/pocketmine/lang/locale b/src/pocketmine/lang/locale
index eac602e8b..9868a649a 160000
--- a/src/pocketmine/lang/locale
+++ b/src/pocketmine/lang/locale
@@ -1 +1 @@
-Subproject commit eac602e8bc084fbaf3bc133129d6c8e4dc517c52
+Subproject commit 9868a649ad9151d9724298b4fcf3345eab9ea409
diff --git a/src/pocketmine/plugin/PluginManager.php b/src/pocketmine/plugin/PluginManager.php
index 4dd93d3e0..0717d9bde 100644
--- a/src/pocketmine/plugin/PluginManager.php
+++ b/src/pocketmine/plugin/PluginManager.php
@@ -255,24 +255,20 @@ class PluginManager{
 							}
 
 							if($compatible === false){
-								$this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [$name, "%pocketmine.plugin.incompatibleAPI"]));
+								$this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [
+									$name,
+									$this->server->getLanguage()->translateString("%pocketmine.plugin.incompatibleAPI", [implode(", ", $description->getCompatibleApis())])
+								]));
 								continue;
 							}
 
 							if(count($pluginMcpeProtocols = $description->getCompatibleMcpeProtocols()) > 0){
 								$serverMcpeProtocols = [ProtocolInfo::CURRENT_PROTOCOL];
 								if(count(array_intersect($pluginMcpeProtocols, $serverMcpeProtocols)) === 0){
-									$this->server->getLogger()->error($this->server->getLanguage()->translateString(
-										"pocketmine.plugin.loadError",
-										[
-											$name,
-											$this->server->getLanguage()->translateString(
-												"%pocketmine.plugin.incompatibleProtocol",
-												[
-													implode(", ", $pluginMcpeProtocols)
-												])
-										]
-									));
+									$this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [
+										$name,
+										$this->server->getLanguage()->translateString("%pocketmine.plugin.incompatibleProtocol", [implode(", ", $pluginMcpeProtocols)])
+									]));
 									continue;
 								}
 							}
@@ -306,7 +302,10 @@ class PluginManager{
 							if(isset($loadedPlugins[$dependency]) or $this->getPlugin($dependency) instanceof Plugin){
 								unset($dependencies[$name][$key]);
 							}elseif(!isset($plugins[$dependency])){
-								$this->server->getLogger()->critical($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [$name, "%pocketmine.plugin.unknownDependency"]));
+								$this->server->getLogger()->critical($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [
+									$name,
+									$this->server->getLanguage()->translateString("%pocketmine.plugin.unknownDependency", [$dependency])
+								]));
 								break;
 							}
 						}