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] 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) }