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

Make properties in MessageKey with @JvmField to allow @JvmField in inherited classes

Browse Source
This commit is contained in:
Him188 2021-01-06 08:13:22 +08:00
parent c307da1225
commit bfd21cbb92
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mirai-core-api/src/commonMain/kotlin/message/data/MessageKey.kt
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2019-2020 Mamoe Technologies and contributors. * Copyright 2019-2021 Mamoe Technologies and contributors.
* *
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
@ -36,6 +36,7 @@ public interface MessageKey<out M : SingleMessage> {
* @see AbstractPolymorphicMessageKey * @see AbstractPolymorphicMessageKey
*/ */
public abstract class AbstractMessageKey<out M : SingleMessage>( public abstract class AbstractMessageKey<out M : SingleMessage>(
@JvmField
override val safeCast: (SingleMessage) -> M?, override val safeCast: (SingleMessage) -> M?,
) : MessageKey<M> ) : MessageKey<M>
@ -73,6 +74,7 @@ public abstract class AbstractPolymorphicMessageKey<out B : SingleMessage, out M
baseKey: MessageKey<B>, baseKey: MessageKey<B>,
safeCast: (SingleMessage) -> M?, safeCast: (SingleMessage) -> M?,
) : MessageKey<M>, AbstractMessageKey<M>(safeCast) { ) : MessageKey<M>, AbstractMessageKey<M>(safeCast) {
@JvmField
internal val topmostKey: MessageKey<*> = internal val topmostKey: MessageKey<*> =
if (baseKey is AbstractPolymorphicMessageKey<*, *>) baseKey.topmostKey else baseKey if (baseKey is AbstractPolymorphicMessageKey<*, *>) baseKey.topmostKey else baseKey
} }