From 4d69ae617fdee02f869a7c874c1bb86f6ab25615 Mon Sep 17 00:00:00 2001 From: Karlatemp Date: Sat, 20 Jun 2020 20:46:00 +0800 Subject: [PATCH] Fix wrong initialization order --- .../net/mamoe/mirai/console/MiraiConsole.kt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt index 3669f780f..5b9fe51fc 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt @@ -15,7 +15,6 @@ import kotlinx.io.charsets.Charset import net.mamoe.mirai.Bot import net.mamoe.mirai.console.plugin.PluginLoader import net.mamoe.mirai.console.plugin.jvm.JarPluginLoader -import net.mamoe.mirai.console.plugin.jvm.JvmPlugin import net.mamoe.mirai.utils.DefaultLogger import net.mamoe.mirai.utils.MiraiExperimentalAPI import net.mamoe.mirai.utils.MiraiLogger @@ -24,17 +23,23 @@ import java.io.File import java.io.PrintStream import kotlin.coroutines.CoroutineContext -/** - * mirai 控制台实例. - */ -object MiraiConsole : CoroutineScope, IMiraiConsole { - private lateinit var instance: IMiraiConsole +internal object MiraiConsoleInitializer { + internal lateinit var instance: IMiraiConsole /** 由前端调用 */ internal fun init(instance: IMiraiConsole) { this.instance = instance } +} + +/** + * mirai 控制台实例. + */ +object MiraiConsole : CoroutineScope, IMiraiConsole { + private val instance: IMiraiConsole + get() = MiraiConsoleInitializer.instance + /** * `mirai-console` build 号 */