Commit 2d366d49 authored by Him188moe's avatar Him188moe

Kotlin coroutine

parent 3ce6096e
...@@ -11,7 +11,6 @@ import net.mamoe.mirai.utils.LoggerTextFormat; ...@@ -11,7 +11,6 @@ import net.mamoe.mirai.utils.LoggerTextFormat;
import net.mamoe.mirai.utils.MiraiLogger; import net.mamoe.mirai.utils.MiraiLogger;
import net.mamoe.mirai.utils.MiraiLoggerKt; import net.mamoe.mirai.utils.MiraiLoggerKt;
import net.mamoe.mirai.utils.config.MiraiConfig; 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.MiraiSettingListSection;
import net.mamoe.mirai.utils.setting.MiraiSettingMapSection; import net.mamoe.mirai.utils.setting.MiraiSettingMapSection;
import net.mamoe.mirai.utils.setting.MiraiSettings; import net.mamoe.mirai.utils.setting.MiraiSettings;
...@@ -19,7 +18,6 @@ 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.File;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Scanner;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
/** /**
...@@ -91,6 +89,7 @@ public final class MiraiServer { ...@@ -91,6 +89,7 @@ public final class MiraiServer {
File setting = new File(this.parentFolder + "/Mirai.ini"); File setting = new File(this.parentFolder + "/Mirai.ini");
getLogger().info("Selecting setting from " + LoggerTextFormat.GREEN + setting); getLogger().info("Selecting setting from " + LoggerTextFormat.GREEN + setting);
/*
if (!setting.exists()) { if (!setting.exists()) {
this.initSetting(setting); this.initSetting(setting);
} else { } else {
...@@ -106,7 +105,7 @@ public final class MiraiServer { ...@@ -106,7 +105,7 @@ public final class MiraiServer {
} }
if (this.qqs.isEmpty()) { if (this.qqs.isEmpty()) {
this.initQQConfig(qqs); this.initQQConfig(qqs);
} }*/
/* /*
MiraiSettingMapSection qqs = this.setting.getMapSection("qq"); MiraiSettingMapSection qqs = this.setting.getMapSection("qq");
......
...@@ -120,6 +120,7 @@ internal class BotNetworkHandlerImpl(private val bot: Bot) : BotNetworkHandler { ...@@ -120,6 +120,7 @@ internal class BotNetworkHandlerImpl(private val bot: Bot) : BotNetworkHandler {
} }
if (packet is ServerEventPacket) { if (packet is ServerEventPacket) {
//no need to sync acknowledgement packets
NetworkScope.launch { NetworkScope.launch {
sendPacket(ClientEventResponsePacket(bot.account.qqNumber, packet.packetId, sessionKey, packet.eventIdentity)) sendPacket(ClientEventResponsePacket(bot.account.qqNumber, packet.packetId, sessionKey, packet.eventIdentity))
} }
......
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