From 20a322a0a0ef75dd184f7ff89d52c2be215356b8 Mon Sep 17 00:00:00 2001 From: Him188moe Date: Fri, 16 Aug 2019 00:16:40 +0800 Subject: [PATCH] update --- .../mirai/network/packet/server/ServerPacket.kt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt index 1e89e2e7c..3bc2adb79 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt +++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt @@ -19,13 +19,12 @@ abstract class ServerPacket(val input: DataInputStream) : Packet { stream.skipUntil(10) val idBytes = stream.readUntil(11) - val id = idBytes.map { it.toString(16) }.joinToString("") - return when (id) { - "08 25 31 01" -> Server0825Packet(Server0825Packet.Type.TYPE_08_25_31_01, stream); - "08 25 31 02" -> Server0825Packet(Server0825Packet.Type.TYPE_08_25_31_02, stream); + return when (idBytes.joinToString("") { it.toString(16) }) { + "08 25 31 01" -> Server0825Packet(Server0825Packet.Type.TYPE_08_25_31_01, stream) + "08 25 31 02" -> Server0825Packet(Server0825Packet.Type.TYPE_08_25_31_02, stream) - else -> throw UnsupportedOperationException(); + else -> throw UnsupportedOperationException() } } } @@ -47,9 +46,9 @@ fun DataInputStream.readUntil(byte: Byte): ByteArray { } fun DataInputStream.readIP(): String { - var buff = ""; + var buff = "" for (i in 0..12) {//todo: check that - buff += readByte().toInt(); + buff += readByte().toInt() } - return buff; + return buff }