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

Do not require plugin to be loaded for getPluginDescription

Browse Source
This commit is contained in:
Him188 2022-05-21 15:25:28 +01:00
parent 753342d99e
commit 26c3bca473
No known key found for this signature in database
GPG Key ID: BA439CDDCF652375
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mirai-console/backend/mirai-console/src/internal/plugin/PluginManagerImpl.kt
View File

@ -22,7 +22,6 @@ import net.mamoe.mirai.console.plugin.PluginManager
import net.mamoe.mirai.console.plugin.PluginManager.INSTANCE.safeLoader import net.mamoe.mirai.console.plugin.PluginManager.INSTANCE.safeLoader
import net.mamoe.mirai.console.plugin.description.PluginDependency import net.mamoe.mirai.console.plugin.description.PluginDependency
import net.mamoe.mirai.console.plugin.description.PluginDescription import net.mamoe.mirai.console.plugin.description.PluginDescription
import net.mamoe.mirai.console.plugin.jvm.JvmPlugin
import net.mamoe.mirai.console.plugin.loader.PluginLoadException import net.mamoe.mirai.console.plugin.loader.PluginLoadException
import net.mamoe.mirai.console.plugin.loader.PluginLoader import net.mamoe.mirai.console.plugin.loader.PluginLoader
import net.mamoe.mirai.console.plugin.name import net.mamoe.mirai.console.plugin.name
@ -74,13 +73,8 @@ internal class PluginManagerImpl(
override val pluginLoaders: List<PluginLoader<*, *>> override val pluginLoaders: List<PluginLoader<*, *>>
get() = _pluginLoaders.toList() get() = _pluginLoaders.toList()
override fun getPluginDescription(plugin: Plugin): PluginDescription = if (plugin is JvmPlugin) { override fun getPluginDescription(plugin: Plugin): PluginDescription =
plugin.safeLoader.getPluginDescription(plugin) plugin.safeLoader.getPluginDescription(plugin)
} else resolvedPlugins.firstOrNull { it == plugin }
?.loader?.cast<PluginLoader<Plugin, PluginDescription>>()
?.getPluginDescription(plugin)
?: error("Plugin is unloaded")
init { init {
MiraiConsole.coroutineContext[Job]!!.invokeOnCompletion { MiraiConsole.coroutineContext[Job]!!.invokeOnCompletion {