From 43beb462212c2e764f14b24016cd9536d6842850 Mon Sep 17 00:00:00 2001 From: wish Date: Fri, 5 Aug 2022 16:41:49 +1000 Subject: [PATCH] rename EnumerateStage variable --- network/mhfpacket/msg_sys_enumerate_stage.go | 8 ++++---- server/channelserver/handlers_stage.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/network/mhfpacket/msg_sys_enumerate_stage.go b/network/mhfpacket/msg_sys_enumerate_stage.go index 925f8944d..a3f125941 100644 --- a/network/mhfpacket/msg_sys_enumerate_stage.go +++ b/network/mhfpacket/msg_sys_enumerate_stage.go @@ -11,9 +11,9 @@ import ( // MsgSysEnumerateStage represents the MSG_SYS_ENUMERATE_STAGE type MsgSysEnumerateStage struct { - AckHandle uint32 - Unk0 uint8 // Hardcoded 1 in the binary - StageID string // NULL terminated string. + AckHandle uint32 + Unk0 uint8 // Hardcoded 1 in the binary + StagePrefix string // NULL terminated string. } // Opcode returns the ID associated with this packet type. @@ -26,7 +26,7 @@ func (m *MsgSysEnumerateStage) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cli m.AckHandle = bf.ReadUint32() m.Unk0 = bf.ReadUint8() bf.ReadUint8() - m.StageID = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes()) + m.StagePrefix = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes()) return nil } diff --git a/server/channelserver/handlers_stage.go b/server/channelserver/handlers_stage.go index 81ddb36f4..4bf19d114 100644 --- a/server/channelserver/handlers_stage.go +++ b/server/channelserver/handlers_stage.go @@ -369,7 +369,7 @@ func handleMsgSysEnumerateStage(s *Session, p mhfpacket.MHFPacket) { continue } - if !strings.Contains(stage.id, pkt.StageID) { + if !strings.Contains(stage.id, pkt.StagePrefix) { continue }