From 63a829c91378ed74116e033e4c2680a9c9553aa7 Mon Sep 17 00:00:00 2001 From: Yslan Ramos Date: Sat, 27 Aug 2022 20:05:25 -0300 Subject: [PATCH] refactor: change `FindSessionByCharID` to search on channel sessions --- server/channelserver/sys_channel_server.go | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/server/channelserver/sys_channel_server.go b/server/channelserver/sys_channel_server.go index 6b2d46f3c..82f29d03a 100644 --- a/server/channelserver/sys_channel_server.go +++ b/server/channelserver/sys_channel_server.go @@ -11,6 +11,7 @@ import ( "erupe-ce/network/binpacket" "erupe-ce/network/mhfpacket" "erupe-ce/server/discordbot" + "github.com/jmoiron/sqlx" "go.uber.org/zap" ) @@ -343,19 +344,11 @@ func (s *Server) DiscordChannelSend(charName string, content string) { func (s *Server) FindSessionByCharID(charID uint32) *Session { for _, c := range s.Channels { - c.stagesLock.RLock() - for _, stage := range c.stages { - stage.RLock() - for client := range stage.clients { - if client.charID == charID { - stage.RUnlock() - c.stagesLock.RUnlock() - return client - } + for _, session := range c.sessions { + if session.charID == charID { + return session } - stage.RUnlock() } - c.stagesLock.RUnlock() } return nil }