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

Fix Plugin.description in PluginManager

Browse Source
This commit is contained in:
Him188 2020-08-27 21:04:25 +08:00
parent 8a3b0046f9
commit b5ab460bf8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/PluginManagerImpl.kt
View File

@ -52,11 +52,14 @@ internal object PluginManagerImpl : PluginManager, CoroutineScope by MiraiConsol
get() = _pluginLoaders.toList() get() = _pluginLoaders.toList()
override val Plugin.description: PluginDescription override val Plugin.description: PluginDescription
get() = resolvedPlugins.firstOrNull { it == this } get() = if (this is JvmPlugin) {
this.safeLoader.getDescription(this)
} else resolvedPlugins.firstOrNull { it == this }
?.loader?.cast<PluginLoader<Plugin, PluginDescription>>() ?.loader?.cast<PluginLoader<Plugin, PluginDescription>>()
?.getDescription(this) ?.getDescription(this)
?: error("Plugin is unloaded") ?: error("Plugin is unloaded")
override fun PluginLoader<*, *>.register(): Boolean = loadersLock.withLock { override fun PluginLoader<*, *>.register(): Boolean = loadersLock.withLock {
if (_pluginLoaders.any { it::class == this::class }) { if (_pluginLoaders.any { it::class == this::class }) {
return false return false