diff --git a/resources/locale b/resources/locale index dcfe3ff18..c940b9f17 160000 --- a/resources/locale +++ b/resources/locale @@ -1 +1 @@ -Subproject commit dcfe3ff1888b2d3adecc00c14870717ed55824cc +Subproject commit c940b9f17188548f78d0dc5fdd4e607c703b7952 diff --git a/src/lang/KnownTranslationFactory.php b/src/lang/KnownTranslationFactory.php index 756d623de..43d3ce3b1 100644 --- a/src/lang/KnownTranslationFactory.php +++ b/src/lang/KnownTranslationFactory.php @@ -1702,14 +1702,6 @@ final class KnownTranslationFactory{ ]); } - public static function pocketmine_plugin_fileError(Translatable|string $param0, Translatable|string $param1, Translatable|string $param2) : Translatable{ - return new Translatable(KnownTranslationKeys::POCKETMINE_PLUGIN_FILEERROR, [ - 0 => $param0, - 1 => $param1, - 2 => $param2, - ]); - } - public static function pocketmine_plugin_genericLoadError(Translatable|string $param0) : Translatable{ return new Translatable(KnownTranslationKeys::POCKETMINE_PLUGIN_GENERICLOADERROR, [ 0 => $param0, diff --git a/src/lang/KnownTranslationKeys.php b/src/lang/KnownTranslationKeys.php index 7f1eb2658..e4301fa24 100644 --- a/src/lang/KnownTranslationKeys.php +++ b/src/lang/KnownTranslationKeys.php @@ -357,7 +357,6 @@ final class KnownTranslationKeys{ public const POCKETMINE_PLUGIN_DISABLE = "pocketmine.plugin.disable"; public const POCKETMINE_PLUGIN_DUPLICATEERROR = "pocketmine.plugin.duplicateError"; public const POCKETMINE_PLUGIN_ENABLE = "pocketmine.plugin.enable"; - public const POCKETMINE_PLUGIN_FILEERROR = "pocketmine.plugin.fileError"; public const POCKETMINE_PLUGIN_GENERICLOADERROR = "pocketmine.plugin.genericLoadError"; public const POCKETMINE_PLUGIN_INCOMPATIBLEAPI = "pocketmine.plugin.incompatibleAPI"; public const POCKETMINE_PLUGIN_INCOMPATIBLEOS = "pocketmine.plugin.incompatibleOS"; diff --git a/src/plugin/PluginManager.php b/src/plugin/PluginManager.php index 3a58e3bc4..1e849bc53 100644 --- a/src/plugin/PluginManager.php +++ b/src/plugin/PluginManager.php @@ -247,14 +247,13 @@ class PluginManager{ try{ $description = $loader->getPluginDescription($file); }catch(PluginDescriptionParseException $e){ - $this->server->getLogger()->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_fileError( + $this->server->getLogger()->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_loadError( $file, - $directory, KnownTranslationFactory::pocketmine_plugin_invalidManifest($e->getMessage()) ))); continue; }catch(\RuntimeException $e){ //TODO: more specific exception handling - $this->server->getLogger()->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_fileError($file, $directory, $e->getMessage()))); + $this->server->getLogger()->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_loadError($file, $e->getMessage()))); $this->server->getLogger()->logException($e); continue; }