From 967fb8f15e5a154c36968f3ff43269203b3e1a96 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 31 Jul 2022 00:10:57 +1000 Subject: [PATCH] fixes related to raviente --- server/channelserver/handlers_cast_binary.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/server/channelserver/handlers_cast_binary.go b/server/channelserver/handlers_cast_binary.go index 5029869ed..8474025f2 100644 --- a/server/channelserver/handlers_cast_binary.go +++ b/server/channelserver/handlers_cast_binary.go @@ -127,15 +127,11 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) { } case BroadcastTypeSemaphore: if pkt.MessageType == 1 { - var session *Semaphore - if _, exists := s.server.semaphore["hs_l0u3B51J9k3"]; exists { - session = s.server.semaphore["hs_l0u3B51J9k3"] - } else if _, exists := s.server.semaphore["hs_l0u3B5129k3"]; exists { - session = s.server.semaphore["hs_l0u3B5129k3"] - } else if _, exists := s.server.semaphore["hs_l0u3B512Ak3"]; exists { - session = s.server.semaphore["hs_l0u3B512Ak3"] + raviSema := getRaviSemaphore(s) + if raviSema != "" { + sema := s.server.semaphore[raviSema] + (*sema).BroadcastMHF(resp, s) } - (*session).BroadcastMHF(resp, s) } else { s.Lock() if s.stage != nil { @@ -246,10 +242,10 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) { sendServerChatMessage(s, "Raviente command not recognised!") } } + s.server.raviente.Unlock() } else { sendServerChatMessage(s, "No one has joined the Great Slaying!") } - s.server.raviente.Unlock() } // END RAVI COMMANDS V2