github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-06 16:10:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/ServerEvent.kt
This commit is contained in:
Him188moe 2019-09-01 01:05:08 +08:00
commit 2e20d75298
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mirai-core/src/main/java/net/mamoe/mirai/network/packet/ServerEvent.kt
View File

@ -147,12 +147,12 @@ class ServerFriendMessageEventPacket(input: DataInputStream, packetId: ByteArray
@ExperimentalUnsignedTypes @ExperimentalUnsignedTypes
override fun decode() { override fun decode() {
//start at Sep1.0:27 //start at Sep1.0:27
qq = input.readInt() qq = input.readInt(0)
val msgLength = input.readShort(22) val msgLength = input.readShort(22)
val fontLength = input.readShort(93+msgLength) val fontLength = input.readShort(93+msgLength)
val offset = msgLength+fontLength val offset = msgLength+fontLength
message = if(input.readByte(97+offset).toUHexString() == "02"){ message = if(input.readByte(97+offset).toUHexString() == "02"){
"[face" + input.goto(103+offset).readVarString(1) + ".gif]" "[face" + input.goto(103+offset).readByte(1).toInt().toString() + ".gif]"
//.gif //.gif
}else { }else {
val offset2 = input.readShort(101 + offset) val offset2 = input.readShort(101 + offset)