From 93ddbc75106ee8c0aad37dd3fac08ff72a86a313 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sat, 18 Jan 2020 21:00:21 +0800
Subject: [PATCH] Specify lambda arg name
---
.../kotlin/net/mamoe/mirai/plugin/PluginBase.kt | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/plugin/PluginBase.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/plugin/PluginBase.kt
index d1ca57074..f14a5b699 100644
--- a/mirai-console/src/main/kotlin/net/mamoe/mirai/plugin/PluginBase.kt
+++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/plugin/PluginBase.kt
@@ -158,25 +158,25 @@ object PluginManager{
fun loadPlugin(description: PluginDescription):Boolean{
- if(!description.noCircularDepend){
+ if (!description.noCircularDepend) {
return false.also {
logger.error("Failed to load plugin " + description.pluginName + " because it has circular dependency")
}
}
//load depends first
- description.depends.forEach{
- if(!pluginsFound.containsKey(it)){
+ description.depends.forEach { dependent ->
+ if (!pluginsFound.containsKey(dependent)) {
return false.also { _ ->
- logger.error("Failed to load plugin " + description.pluginName + " because it need " + it + " as dependency")
+ logger.error("Failed to load plugin " + description.pluginName + " because it need " + dependent + " as dependency")
}
}
- val depend = pluginsFound[it]!!
+ val depend = pluginsFound[dependent]!!
//还没有加载
- if(!depend.loaded) {
- if (!loadPlugin(pluginsFound[it]!!)) {
+ if (!depend.loaded) {
+ if (!loadPlugin(pluginsFound[dependent]!!)) {
return false.also { _ ->
- logger.error("Failed to load plugin " + description.pluginName + " because " + it + " as dependency failed to load")
+ logger.error("Failed to load plugin " + description.pluginName + " because " + dependent + " as dependency failed to load")
}
}
}