Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-14 07:55:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor TransitMessage handler

Browse Source
This commit is contained in:
wish
2023-12-02 18:38:33 +11:00
parent 64427fd317
commit 622b2efa03
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/channelserver/handlers.go
View File

@@ -570,13 +570,11 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
sb3 := byteframe.NewByteFrameFromBytes(stage.rawBinaryData[stageBinaryKey{1, 3}]) sb3 := byteframe.NewByteFrameFromBytes(stage.rawBinaryData[stageBinaryKey{1, 3}])
sb3.Seek(4, 0) sb3.Seek(4, 0)
stageDataParams := 8 stageDataParams := 7
if _config.ErupeConfig.RealClientMode <= _config.G10 { if _config.ErupeConfig.RealClientMode <= _config.G10 {
stageDataParams = 4 stageDataParams = 4
} else if _config.ErupeConfig.RealClientMode <= _config.Z1 { } else if _config.ErupeConfig.RealClientMode <= _config.Z1 {
stageDataParams = 6 stageDataParams = 6
} else if _config.ErupeConfig.RealClientMode <= _config.Z2 {
stageDataParams = 7
} }
var stageData []int16 var stageData []int16
@@ -623,8 +621,14 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
resp.WriteUint8(uint8(len(stage.rawBinaryData[stageBinaryKey{1, 1}]))) resp.WriteUint8(uint8(len(stage.rawBinaryData[stageBinaryKey{1, 1}])))
for i := range stageData { for i := range stageData {
resp.WriteInt16(stageData[i]) if _config.ErupeConfig.RealClientMode >= _config.Z1 {
resp.WriteInt16(stageData[i])
} else {
resp.WriteInt8(int8(stageData[i]))
}
} }
resp.WriteUint8(0) // Unk
resp.WriteUint8(0) // Unk
resp.WriteNullTerminatedBytes([]byte(stage.id)) resp.WriteNullTerminatedBytes([]byte(stage.id))
resp.WriteBytes(stage.rawBinaryData[stageBinaryKey{1, 0}]) resp.WriteBytes(stage.rawBinaryData[stageBinaryKey{1, 0}])
@@ -633,10 +637,6 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
} }
} }
} }
if (pkt.SearchType == 1 || pkt.SearchType == 3) && count == 0 {
doAckBufFail(s, pkt.AckHandle, make([]byte, 4))
return
}
resp.Seek(0, io.SeekStart) resp.Seek(0, io.SeekStart)
resp.WriteUint16(count) resp.WriteUint16(count)
doAckBufSucceed(s, pkt.AckHandle, resp.Data()) doAckBufSucceed(s, pkt.AckHandle, resp.Data())