Commit f695c9f7 authored by Him188's avatar Him188

Fix a logical mistake

parent d4dd720e
...@@ -56,17 +56,14 @@ internal class TIMBotNetworkHandler internal constructor(private val bot: Bot) : ...@@ -56,17 +56,14 @@ internal class TIMBotNetworkHandler internal constructor(private val bot: Bot) :
} }
override suspend fun login(configuration: BotNetworkConfiguration): LoginResult = withContext(this.coroutineContext) { override suspend fun login(configuration: BotNetworkConfiguration): LoginResult = withContext(this.coroutineContext) {
TIMProtocol.SERVER_IP.forEach { TIMProtocol.SERVER_IP.forEach { ip ->
bot.logger.logInfo("Connecting server $it") bot.logger.logInfo("Connecting server $ip")
socket = BotSocketAdapter(it, configuration) socket = BotSocketAdapter(ip, configuration)
loginResult = CompletableDeferred() loginResult = CompletableDeferred()
val state = socket.resendTouch() socket.resendTouch().takeIf { it != LoginResult.TIMEOUT }?.let { return@withContext it }
if (state != LoginResult.TIMEOUT) {
return@withContext state
}
bot.logger.logPurple("Timeout. Retrying next server") bot.logger.logPurple("Timeout. Retrying next server")
socket.close() socket.close()
...@@ -206,7 +203,7 @@ internal class TIMBotNetworkHandler internal constructor(private val bot: Bot) : ...@@ -206,7 +203,7 @@ internal class TIMBotNetworkHandler internal constructor(private val bot: Bot) :
// Remove first to release the lock // Remove first to release the lock
handlersLock.withLock { handlersLock.withLock {
temporaryPacketHandlers.filter { it.filter(session, packet) } temporaryPacketHandlers.filter { it.filter(session, packet) }.also { temporaryPacketHandlers.removeAll(it) }
}.forEach { }.forEach {
it.doReceiveWithoutExceptions(packet) it.doReceiveWithoutExceptions(packet)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment