From 3f5fdfb3a4386242281c99b52983ec3b99d207f4 Mon Sep 17 00:00:00 2001 From: liujiahua123123 Date: Sat, 17 Aug 2019 21:57:48 +0800 Subject: [PATCH] ?? --- .../mamoe/mirai/network/packet/server/Server0825Packet.kt | 8 ++++---- mirai-core/src/test/java/PacketTest.kt | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/Server0825Packet.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/Server0825Packet.kt index b54f0a922..ce364b602 100644 --- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/Server0825Packet.kt +++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/Server0825Packet.kt @@ -11,9 +11,9 @@ import java.io.DataInputStream class Server0825Packet(private val type: Type, inputStream: DataInputStream) : ServerPacket(inputStream) { lateinit var serverIP: String; - var loginTime: Int = 0; - lateinit var loginIP: String; - lateinit var token: ByteArray; + var loginTime: Int = 0 + lateinit var loginIP: String + lateinit var token: ByteArray lateinit var tgtgtKey: ByteArray enum class Type { @@ -36,7 +36,7 @@ class Server0825Packet(private val type: Type, inputStream: DataInputStream) : S serverIP = data.readIP() } 0X00 -> { - data.skip(5) + data.skip(4) token = data.readNBytes(56) data.skip(28) diff --git a/mirai-core/src/test/java/PacketTest.kt b/mirai-core/src/test/java/PacketTest.kt index 3dd9f02a3..31321c903 100644 --- a/mirai-core/src/test/java/PacketTest.kt +++ b/mirai-core/src/test/java/PacketTest.kt @@ -12,6 +12,7 @@ fun main(){ val s = DataInputStream(data.hexToBytes().inputStream()) val packet = Server0825Packet(Server0825Packet.Type.TYPE_08_25_31_01,s) packet.decode() + System.out.println(packet.token.toUByteArray().toHexString(" ")) System.out.println(packet.loginTime) System.out.println(packet.loginIP) } \ No newline at end of file