Merge pull request #561 from sandtechnology/Fix#550

Fix #550: NoSuchElementException when concatenating an EmptyMessageChain with another
2025-01-03 01:14:44 +08:00 · 2020-09-01 20:09:28 +08:00 · 2020-09-01 20:09:28 +08:00 · 89974923f8
commit 89974923f8
parent bf4e205b1b 208ecfc1b2
1 changed files with 3 additions and 1 deletions
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/impl.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/impl.kt
@ -178,7 +178,9 @@ internal fun Message.followedByImpl(tail: Message): MessageChain {
                    } else if (!tailUsed) {
                        tailUsed = true
                        iterator = tail.iterator()
-                        iterator.next()
+                        if (iterator.hasNext()) {
+                            iterator.next()
+                        } else null
                    } else null
                }
            )