From 7769183f0231734bff6c20c0adf8ff0ab1df6830 Mon Sep 17 00:00:00 2001 From: PeratX <1215714524@qq.com> Date: Mon, 13 Apr 2020 00:13:57 +0800 Subject: [PATCH 1/3] PluginManager: do not clear plugin seq when reloading --- .../net/mamoe/mirai/console/plugins/PluginManager.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt index e4e4a639e..6c7743b7d 100644 --- a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt +++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt @@ -159,7 +159,7 @@ object PluginManager { /** * 尝试加载全部插件 */ - fun loadPlugins() { + fun loadPlugins(clear: Boolean = true) { logger.info("""开始加载${pluginsPath}下的插件""") val findPluginsResult = findPlugins() val pluginsFound = findPluginsResult.pluginsFound @@ -249,8 +249,10 @@ object PluginManager { } - //清掉优先级队列, 来重新填充 - pluginsSequence.clear() + if (clear) { + //清掉优先级队列, 来重新填充 + pluginsSequence.clear() + } pluginsFound.values.forEach { try { @@ -341,7 +343,7 @@ object PluginManager { disablePlugin(it) } } - loadPlugins() + loadPlugins(false) } From 10fd960aeea8f097c6926537c511cfb6d5907ef7 Mon Sep 17 00:00:00 2001 From: "jiahua.liu" Date: Mon, 13 Apr 2020 17:32:28 +0800 Subject: [PATCH 2/3] fix typo --- .../kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt index e4e4a639e..59341be15 100644 --- a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt +++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt @@ -165,7 +165,7 @@ object PluginManager { val pluginsFound = findPluginsResult.pluginsFound val pluginsLocation = findPluginsResult.pluginsLocation - //不仅要解决A->B->C->A, 还要解决A->B->C->A + //不仅要解决A->B->C->A, 还要解决A->B->A->A fun checkNoCircularDepends( target: PluginDescription, needDepends: List, From de39804d25be069c17d3f42a01bbbaa23c38a78d Mon Sep 17 00:00:00 2001 From: "jiahua.liu" Date: Mon, 13 Apr 2020 17:50:38 +0800 Subject: [PATCH 3/3] release 049 --- buildSrc/src/main/kotlin/versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/versions.kt b/buildSrc/src/main/kotlin/versions.kt index ed00681bb..91670118b 100644 --- a/buildSrc/src/main/kotlin/versions.kt +++ b/buildSrc/src/main/kotlin/versions.kt @@ -12,7 +12,7 @@ import org.gradle.kotlin.dsl.DependencyHandlerScope object Versions { object Mirai { const val core = "0.37.1" - const val console = "0.4.8" + const val console = "0.4.9" const val consoleGraphical = "0.0.7" const val consoleWrapper = "0.2.0" }