Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-03-21 23:22:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(guild): fix variable shadowing causing nil panic in scout list (#171)

Browse Source 
The else branch redeclared guildInfo with := scoping it to the block,
so the outer guildInfo remained nil when reaching ListInvitedCharacters.
Restructure the conditional to assign to the existing variable instead.
This commit is contained in:
Houmgaor
2026-03-03 18:01:20 +01:00
parent 5b631d1704
commit 8e79fe6834
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/channelserver/handlers_guild_scout.go
View File

@@ -106,11 +106,12 @@ func handleMsgMhfGetGuildScoutList(s *Session, p mhfpacket.MHFPacket) {
s.logger.Warn("Failed to get guild for scout list", zap.Error(err)) s.logger.Warn("Failed to get guild for scout list", zap.Error(err))
} }
if guildInfo == nil && s.prevGuildID == 0 { if guildInfo == nil {
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) if s.prevGuildID == 0 {
return doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} else { return
guildInfo, err := s.server.guildRepo.GetByID(s.prevGuildID) }
guildInfo, err = s.server.guildRepo.GetByID(s.prevGuildID)
if guildInfo == nil || err != nil { if guildInfo == nil || err != nil {
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
return return