mirror of
https://github.com/Mezeporta/Erupe.git
synced 2025-12-16 08:55:31 +01:00
handle interception map response for guildless players
This commit is contained in:
@@ -452,12 +452,12 @@ func handleMsgMhfGetUdGuildMapInfo(s *Session, p mhfpacket.MHFPacket) {
|
|||||||
|
|
||||||
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))
|
doAckBufSucceed(s, pkt.AckHandle, []byte{0xFF})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
isApplicant, _ := guild.HasApplicationForCharID(s, s.charID)
|
isApplicant, _ := guild.HasApplicationForCharID(s, s.charID)
|
||||||
if err != nil || isApplicant {
|
if err != nil || isApplicant {
|
||||||
doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
|
doAckBufSucceed(s, pkt.AckHandle, []byte{0xFF})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -468,7 +468,7 @@ func handleMsgMhfGetUdGuildMapInfo(s *Session, p mhfpacket.MHFPacket) {
|
|||||||
var _interceptionPoints pq.ByteaArray
|
var _interceptionPoints pq.ByteaArray
|
||||||
err = s.server.db.QueryRow(`SELECT interception_maps, (SELECT ARRAY(SELECT interception_points FROM guild_characters gc WHERE gc.guild_id = g.id)) AS interception_points FROM public.guilds g WHERE g.id=$1`, guild.ID).Scan(&interceptionMaps, &_interceptionPoints)
|
err = s.server.db.QueryRow(`SELECT interception_maps, (SELECT ARRAY(SELECT interception_points FROM guild_characters gc WHERE gc.guild_id = g.id)) AS interception_points FROM public.guilds g WHERE g.id=$1`, guild.ID).Scan(&interceptionMaps, &_interceptionPoints)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.server.logger.Debug("err", zap.Error(err))
|
s.server.logger.Error("Failed to load interception map data", zap.Error(err))
|
||||||
doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
|
doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user