From 9e6b16c3e586e4d25b0e5666c7149ec9196c2587 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sun, 1 Nov 2020 23:54:49 +0800
Subject: [PATCH] Fix findMiraiInstance

---
 mirai-core-api/src/jvmMain/kotlin/findMiraiInstance.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mirai-core-api/src/jvmMain/kotlin/findMiraiInstance.kt b/mirai-core-api/src/jvmMain/kotlin/findMiraiInstance.kt
index 47f9983b4..1bd732bd5 100644
--- a/mirai-core-api/src/jvmMain/kotlin/findMiraiInstance.kt
+++ b/mirai-core-api/src/jvmMain/kotlin/findMiraiInstance.kt
@@ -12,6 +12,6 @@ package net.mamoe.mirai
 import java.util.*
 
 internal actual fun findMiraiInstance(): Mirai {
-    return ServiceLoader.load(Mirai::class.java).findFirst() as Mirai?
+    return ServiceLoader.load(Mirai::class.java).findFirst().orElse(null)
         ?: Class.forName("net.mamoe.mirai.internal.MiraiImpl").kotlin.objectInstance as Mirai
 }
\ No newline at end of file