From e04c18bccfdffb258d7f868704fbb0101e719cd2 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 23 Apr 2023 15:35:18 +1000 Subject: [PATCH] fix DeleteSemaphore variable naming --- network/mhfpacket/msg_sys_delete_semaphore.go | 4 ++-- server/channelserver/handlers_semaphore.go | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/network/mhfpacket/msg_sys_delete_semaphore.go b/network/mhfpacket/msg_sys_delete_semaphore.go index a976a708b..d10148cf6 100644 --- a/network/mhfpacket/msg_sys_delete_semaphore.go +++ b/network/mhfpacket/msg_sys_delete_semaphore.go @@ -10,7 +10,7 @@ import ( // MsgSysDeleteSemaphore represents the MSG_SYS_DELETE_SEMAPHORE type MsgSysDeleteSemaphore struct { - AckHandle uint32 + SemaphoreID uint32 } // Opcode returns the ID associated with this packet type. @@ -20,7 +20,7 @@ func (m *MsgSysDeleteSemaphore) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgSysDeleteSemaphore) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() + m.SemaphoreID = bf.ReadUint32() return nil } diff --git a/server/channelserver/handlers_semaphore.go b/server/channelserver/handlers_semaphore.go index cbf1a0a7f..be9e7ff87 100644 --- a/server/channelserver/handlers_semaphore.go +++ b/server/channelserver/handlers_semaphore.go @@ -55,12 +55,11 @@ func releaseRaviSemaphore(s *Session, sema *Semaphore) { func handleMsgSysDeleteSemaphore(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgSysDeleteSemaphore) - sem := pkt.AckHandle if s.server.semaphore != nil { destructEmptySemaphores(s) s.server.semaphoreLock.Lock() for id, sema := range s.server.semaphore { - if sema.id == sem { + if sema.id == pkt.SemaphoreID { if strings.HasPrefix(id, "hs_l0u3B5") { releaseRaviSemaphore(s, sema) s.server.semaphoreLock.Unlock()