Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-13 23:44:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix raviente announcements

Browse Source
This commit is contained in:
wish
2022-08-02 15:38:18 +10:00
parent 2bd9fcc6ba
commit 67ea64cb66
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
network/mhfpacket/msg_mhf_announce.go
View File

@@ -1,20 +1,20 @@
package mhfpacket package mhfpacket
import ( import (
"errors" "errors"
"erupe-ce/network/clientctx"
"erupe-ce/network"
"erupe-ce/common/byteframe" "erupe-ce/common/byteframe"
"erupe-ce/network"
"erupe-ce/network/clientctx"
) )
// MsgMhfAnnounce represents the MSG_MHF_ANNOUNCE // MsgMhfAnnounce represents the MSG_MHF_ANNOUNCE
type MsgMhfAnnounce struct { type MsgMhfAnnounce struct {
AckHandle uint32 AckHandle uint32
IPAddress uint32 IPAddress uint32
Port uint16 Port uint16
StageID []byte StageID []byte
Type uint8 Type uint8
} }
// Opcode returns the ID associated with this packet type. // Opcode returns the ID associated with this packet type.
@@ -24,18 +24,14 @@ func (m *MsgMhfAnnounce) Opcode() network.PacketID {
// Parse parses the packet from binary // Parse parses the packet from binary
func (m *MsgMhfAnnounce) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { func (m *MsgMhfAnnounce) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
m.AckHandle = bf.ReadUint32() m.AckHandle = bf.ReadUint32()
m.IPAddress = bf.ReadUint32() m.IPAddress = bf.ReadUint32()
m.Port = bf.ReadUint16() m.Port = bf.ReadUint16()
_ = bf.ReadUint8() _ = bf.ReadUint8()
_ = bf.ReadUint16() _ = bf.ReadUint16()
m.StageID = bf.ReadNullTerminatedBytes() m.StageID = bf.ReadBytes(32)
for { _ = bf.ReadUint32()
if bf.ReadUint8() != 0 { m.Type = bf.ReadUint8()
m.Type = bf.ReadUint8()
break
}
}
return nil return nil
} }

3
server/channelserver/sys_channel_server.go
View File

@@ -351,8 +351,7 @@ func (s *Server) BroadcastRaviente(ip uint32, port uint16, stage []byte, _type u
bf.WriteUint32(ip) // IP address bf.WriteUint32(ip) // IP address
bf.WriteUint16(port) // Port bf.WriteUint16(port) // Port
bf.WriteUint16(0) // Unk bf.WriteUint16(0) // Unk
bf.WriteNullTerminatedBytes(stage) bf.WriteBytes(stage)
bf.WriteBytes(make([]byte, 17))
s.WorldcastMHF(&mhfpacket.MsgSysCastedBinary{ s.WorldcastMHF(&mhfpacket.MsgSysCastedBinary{
CharID: 0x00000000, CharID: 0x00000000,
BroadcastType: BroadcastTypeServer, BroadcastType: BroadcastTypeServer,