From 94175e6e85d5a68e9aff0c33e699def79df760ce Mon Sep 17 00:00:00 2001 From: Houmgaor Date: Fri, 30 Jan 2026 01:03:20 +0100 Subject: [PATCH] fix(guild): fix nil pointer condition in GetGuildManageRight Cherry-picked from main (5028355) with conflict resolution. Changes condition from && to || to properly handle the case where a player has a guild but also has a prevGuildID set. --- server/channelserver/handlers_guild.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/channelserver/handlers_guild.go b/server/channelserver/handlers_guild.go index 067133f74..6091c5949 100644 --- a/server/channelserver/handlers_guild.go +++ b/server/channelserver/handlers_guild.go @@ -1456,8 +1456,7 @@ func handleMsgMhfGetGuildManageRight(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfGetGuildManageRight) guild, err := GetGuildInfoByCharacterId(s, s.charID) - - if guild == nil && s.prevGuildID != 0 { + if guild == nil || s.prevGuildID != 0 { guild, err = GetGuildInfoByID(s, s.prevGuildID) s.prevGuildID = 0 if guild == nil || err != nil {