From 85bff0cb199441456012857c1af3eb83ac6e999d Mon Sep 17 00:00:00 2001 From: wish Date: Sat, 12 Nov 2022 13:09:59 +1100 Subject: [PATCH] raviente broadcast fixes --- server/channelserver/sys_channel_server.go | 7 +++++-- server/channelserver/sys_language.go | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/channelserver/sys_channel_server.go b/server/channelserver/sys_channel_server.go index 233c49a7a..7c7447dfa 100644 --- a/server/channelserver/sys_channel_server.go +++ b/server/channelserver/sys_channel_server.go @@ -284,6 +284,7 @@ func (s *Server) WorldcastMHF(pkt mhfpacket.MHFPacket, ignoredSession *Session, bf := byteframe.NewByteFrame() bf.WriteUint16(uint16(pkt.Opcode())) pkt.Build(bf, session.clientContext) + bf.WriteUint16(0x0010) session.QueueSendNonBlocking(bf.Data()) } } @@ -319,14 +320,16 @@ func (s *Server) BroadcastRaviente(ip uint32, port uint16, stage []byte, _type u switch _type { case 2: text = s.dict["ravienteBerserk"] - case 4: + case 3: text = s.dict["ravienteExtreme"] + case 4: + text = s.dict["ravienteExtremeLimited"] case 5: text = s.dict["ravienteBerserkSmall"] default: s.logger.Error("Unk raviente type", zap.Uint8("_type", _type)) } - ps.Uint16(bf, text, false) + ps.Uint16(bf, text, true) bf.WriteBytes([]byte{0x5F, 0x53, 0x00}) bf.WriteUint32(ip) // IP address bf.WriteUint16(port) // Port diff --git a/server/channelserver/sys_language.go b/server/channelserver/sys_language.go index 28f91c7d3..1dc917559 100644 --- a/server/channelserver/sys_language.go +++ b/server/channelserver/sys_language.go @@ -8,6 +8,7 @@ func getLangStrings(s *Server) map[string]string { strings["cafeReset"] = "%d/%dにリセット" strings["ravienteBerserk"] = "<大討伐:猛狂期>が開催されました!" strings["ravienteExtreme"] = "<大討伐:猛狂期【極】>が開催されました!" + strings["ravienteExtremeLimited"] = "<大討伐:猛狂期【極】(制限付)>が開催されました!" strings["ravienteBerserkSmall"] = "<大討伐:猛狂期(小数)>が開催されました!" strings["guildInviteName"] = "猟団勧誘のご案内" @@ -29,6 +30,7 @@ func getLangStrings(s *Server) map[string]string { strings["cafeReset"] = "Resets on %d/%d" strings["ravienteBerserk"] = " is being held!" strings["ravienteExtreme"] = " is being held!" + strings["ravienteExtremeLimited"] = " is being held!" strings["ravienteBerserkSmall"] = " is being held!" strings["guildInviteName"] = "Invitation!"