From c353e8e8f998f2809bb9f87235a46a0c9592259d Mon Sep 17 00:00:00 2001
From: Him188moe <Him188>
Date: Wed, 4 Sep 2019 22:57:46 +0800
Subject: [PATCH] Updated robot & network structure sendPacket is not async now
---
.../mirai/network/RobotNetworkHandler.kt | 21 ++++++++++---------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/RobotNetworkHandler.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/RobotNetworkHandler.kt
index c28f20f31..b19399d84 100644
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/RobotNetworkHandler.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/RobotNetworkHandler.kt
@@ -363,19 +363,20 @@ internal class RobotNetworkHandler(private val robot: Robot) : Closeable {
}
+ /**
+ * Not async
+ */
@ExperimentalUnsignedTypes
fun sendPacket(packet: ClientPacket) {
- MiraiThreadPool.getInstance().submit {
- try {
- packet.encode()
- packet.writeHex(Protocol.tail)
+ try {
+ packet.encode()
+ packet.writeHex(Protocol.tail)
- val data = packet.toByteArray()
- socket.send(DatagramPacket(data, data.size))
- MiraiLogger info "Packet sent: $packet"
- } catch (e: Throwable) {
- e.printStackTrace()
- }
+ val data = packet.toByteArray()
+ socket.send(DatagramPacket(data, data.size))
+ MiraiLogger info "Packet sent: $packet"
+ } catch (e: Throwable) {
+ e.printStackTrace()
}
}