github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-02 04:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Specify lambda arg name

Browse Source
This commit is contained in:
Him188 2020-01-18 21:00:21 +08:00
parent ea740f2690
commit 93ddbc7510
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mirai-console/src/main/kotlin/net/mamoe/mirai/plugin/PluginBase.kt
View File

@ -158,25 +158,25 @@ object PluginManager{
fun loadPlugin(description: PluginDescription):Boolean{ fun loadPlugin(description: PluginDescription):Boolean{
if(!description.noCircularDepend){ if (!description.noCircularDepend) {
return false.also { return false.also {
logger.error("Failed to load plugin " + description.pluginName + " because it has circular dependency") logger.error("Failed to load plugin " + description.pluginName + " because it has circular dependency")
} }
} }
//load depends first //load depends first
description.depends.forEach{ description.depends.forEach { dependent ->
if(!pluginsFound.containsKey(it)){ if (!pluginsFound.containsKey(dependent)) {
return false.also { _ -> 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 (!depend.loaded) {
if (!loadPlugin(pluginsFound[it]!!)) { if (!loadPlugin(pluginsFound[dependent]!!)) {
return false.also { _ -> 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")
} }
} }
} }