From 2d366d49a97be528ec23be449b541cfc16ab8f96 Mon Sep 17 00:00:00 2001 From: Him188moe Date: Tue, 24 Sep 2019 22:42:49 +0800 Subject: [PATCH] Kotlin coroutine --- mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java | 5 ++--- .../java/net/mamoe/mirai/network/BotNetworkHandlerImpl.kt | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java b/mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java index d38157244..a0dfc68f1 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java +++ b/mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java @@ -11,7 +11,6 @@ import net.mamoe.mirai.utils.LoggerTextFormat; import net.mamoe.mirai.utils.MiraiLogger; import net.mamoe.mirai.utils.MiraiLoggerKt; import net.mamoe.mirai.utils.config.MiraiConfig; -import net.mamoe.mirai.utils.config.MiraiConfigSection; import net.mamoe.mirai.utils.setting.MiraiSettingListSection; import net.mamoe.mirai.utils.setting.MiraiSettingMapSection; import net.mamoe.mirai.utils.setting.MiraiSettings; @@ -19,7 +18,6 @@ import net.mamoe.mirai.utils.setting.MiraiSettings; import java.io.File; import java.io.IOException; import java.util.List; -import java.util.Scanner; import java.util.concurrent.ExecutionException; /** @@ -91,6 +89,7 @@ public final class MiraiServer { File setting = new File(this.parentFolder + "/Mirai.ini"); getLogger().info("Selecting setting from " + LoggerTextFormat.GREEN + setting); + /* if (!setting.exists()) { this.initSetting(setting); } else { @@ -106,7 +105,7 @@ public final class MiraiServer { } if (this.qqs.isEmpty()) { this.initQQConfig(qqs); - } + }*/ /* MiraiSettingMapSection qqs = this.setting.getMapSection("qq"); diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/BotNetworkHandlerImpl.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/BotNetworkHandlerImpl.kt index 5778777f1..cea484d44 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/BotNetworkHandlerImpl.kt +++ b/mirai-core/src/main/java/net/mamoe/mirai/network/BotNetworkHandlerImpl.kt @@ -120,6 +120,7 @@ internal class BotNetworkHandlerImpl(private val bot: Bot) : BotNetworkHandler { } if (packet is ServerEventPacket) { + //no need to sync acknowledgement packets NetworkScope.launch { sendPacket(ClientEventResponsePacket(bot.account.qqNumber, packet.packetId, sessionKey, packet.eventIdentity)) }