return fail before generating maps

This commit is contained in:
wish
2022-11-17 09:03:37 +11:00
parent d5bc0916ba
commit b8ef805129

View File

@@ -820,8 +820,6 @@ func GenerateUdGuildMaps() ([]MapData, []MapBranch) {
func handleMsgMhfGenerateUdGuildMap(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfGenerateUdGuildMap(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfGenerateUdGuildMap) pkt := p.(*mhfpacket.MsgMhfGenerateUdGuildMap)
interceptionMaps := &InterceptionMaps{}
interceptionMaps.Maps, interceptionMaps.Branches = GenerateUdGuildMaps()
guild, err := GetGuildInfoByCharacterId(s, s.charID) guild, err := GetGuildInfoByCharacterId(s, s.charID)
if err != nil || guild == nil { if err != nil || guild == nil {
doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
@@ -832,6 +830,8 @@ func handleMsgMhfGenerateUdGuildMap(s *Session, p mhfpacket.MHFPacket) {
doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
return return
} }
interceptionMaps := &InterceptionMaps{}
interceptionMaps.Maps, interceptionMaps.Branches = GenerateUdGuildMaps()
_, err = s.server.db.Exec(`UPDATE guilds SET interception_maps=$1 WHERE guilds.id=$2`, interceptionMaps, guild.ID) _, err = s.server.db.Exec(`UPDATE guilds SET interception_maps=$1 WHERE guilds.id=$2`, interceptionMaps, guild.ID)
if err != nil { if err != nil {
s.server.logger.Debug("err", zap.Error(err)) s.server.logger.Debug("err", zap.Error(err))