From 174f58c0148bd13d51608a160f714fd885fed636 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 12 Feb 2023 01:35:48 +1100 Subject: [PATCH] fix nil savedata error proper --- server/channelserver/handlers.go | 2 +- server/channelserver/handlers_character.go | 2 ++ server/channelserver/handlers_guild.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/channelserver/handlers.go b/server/channelserver/handlers.go index dbd056a3a..3dd1fa76c 100644 --- a/server/channelserver/handlers.go +++ b/server/channelserver/handlers.go @@ -253,7 +253,7 @@ func logoutPlayer(s *Session) { removeSessionFromStage(s) saveData, err := GetCharacterSaveData(s, s.charID) - if err != nil || saveData == nil { + if err != nil { s.logger.Error("Failed to get savedata") return } diff --git a/server/channelserver/handlers_character.go b/server/channelserver/handlers_character.go index 8499f9b17..7de800e04 100644 --- a/server/channelserver/handlers_character.go +++ b/server/channelserver/handlers_character.go @@ -2,6 +2,7 @@ package channelserver import ( "encoding/binary" + "errors" "erupe-ce/common/bfutil" "erupe-ce/common/stringsupport" @@ -58,6 +59,7 @@ func GetCharacterSaveData(s *Session, charID uint32) (*CharacterSaveData, error) } defer result.Close() if !result.Next() { + err = errors.New("no savedata found") s.logger.Error("No savedata found", zap.Uint32("charID", charID)) return nil, err } diff --git a/server/channelserver/handlers_guild.go b/server/channelserver/handlers_guild.go index f4e5b1991..feb56857f 100644 --- a/server/channelserver/handlers_guild.go +++ b/server/channelserver/handlers_guild.go @@ -785,7 +785,7 @@ func handleDonateRP(s *Session, amount uint16, guild *Guild, isEvent bool) []byt bf := byteframe.NewByteFrame() bf.WriteUint32(0) saveData, err := GetCharacterSaveData(s, s.charID) - if err != nil || saveData == nil { + if err != nil { return bf.Data() } saveData.RP -= amount