Fix `MessageChainBuilder.addAndCheckConstrainSingle`

7015f0f4 · Him188 · 5c8e995d · 7015f0f4
Commit 7015f0f4 authored Apr 06, 2020 by Him188
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/builder.kt ...commonMain/kotlin/net.mamoe.mirai/message/data/builder.kt +7 -2

No files found.
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/builder.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/builder.kt
@@ -63,8 +63,13 @@ class MessageChainBuilder private constructor(
            }
            val key = element.key

-            container[container.indexOfFirst(firstConstrainSingleIndex) { it is ConstrainSingle<*> && it.key == key }] =
-                element
+            val index = container.indexOfFirst(firstConstrainSingleIndex) { it is ConstrainSingle<*> && it.key == key }
+            if (index != -1) {
+                container[index] = element
+            } else {
+                add(element)
+            }
+
            return true
        } else {
            return container.add(element)