Merge remote-tracking branch 'origin/master'

mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/Client0825ResponsePacket.kt

@@ -9,6 +9,7 @@ import java.io.IOException
 /**
  * @author Him188moe @ Mirai Project
  */
+@ExperimentalUnsignedTypes
 @PacketId(0x08_25_31_02)
 class Client0825ResponsePacket(private val serverIP: String, private val qq: Int) : ClientPacket() {
     @ExperimentalUnsignedTypes

mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/ClientPacket.kt

@@ -11,6 +11,7 @@ import java.io.IOException
 /**
  * @author Him188moe @ Mirai Project
  */
+@ExperimentalUnsignedTypes
 abstract class ClientPacket : ByteArrayDataOutputStream(), Packet {
     @Getter
     val packageId: Int

mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/Server0825Packet.kt

 package net.mamoe.mirai.network.packet.server
 
-import net.mamoe.mirai.network.Protocol
-import net.mamoe.mirai.util.TEACryptor
 import net.mamoe.mirai.util.getRandomKey
 import java.io.DataInputStream
 
@@ -25,11 +23,12 @@ class Server0825Packet(private val type: Type, inputStream: DataInputStream) : S
 
     @ExperimentalUnsignedTypes
     override fun decode() {
-        input.skip(43 - 11)//todo: check
+        /*input.skip(43 - 11)//todo: check
         val data = DataInputStream(TEACryptor.decrypt(input.readAllBytes().let { it.copyOfRange(0, it.size - 2) }, when (type) {//todo: check array range
             Type.TYPE_08_25_31_01 -> Protocol.redirectionKey.toByteArray()
             Type.TYPE_08_25_31_02 -> Protocol._0825key.toByteArray()
-        }).inputStream());
+        }).inputStream());*/
+        val data = input;
 
         when (data.readByte().toInt()) {
             0xFE -> {