From 0b90dfd458274820f7cafecc93072147848d3b8c Mon Sep 17 00:00:00 2001 From: wish Date: Fri, 5 Aug 2022 20:47:20 +1000 Subject: [PATCH] fix binpath reference when overriding saves --- server/channelserver/handlers_data.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/server/channelserver/handlers_data.go b/server/channelserver/handlers_data.go index d0ae083b0..1f18fe262 100644 --- a/server/channelserver/handlers_data.go +++ b/server/channelserver/handlers_data.go @@ -290,21 +290,14 @@ func dumpSaveData(s *Session, data []byte, suffix string) { func handleMsgMhfLoaddata(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfLoaddata) - overrideFile := filepath.Join(".", "bin", "save_override.bin") - var data []byte - - if _, err := os.Stat(overrideFile); err == nil { - file, err := os.Open(overrideFile) - if err != nil { - panic(err) - } - data, err := ioutil.ReadAll(file) - if err != nil { - panic(err) - } + if _, err := os.Stat(filepath.Join(s.server.erupeConfig.BinPath, "save_override.bin")); err == nil { + data, _ := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "save_override.bin")) doAckBufSucceed(s, pkt.AckHandle, data) + return } + var data []byte + err := s.server.db.QueryRow("SELECT savedata FROM characters WHERE id = $1", s.charID).Scan(&data) if err != nil { s.logger.Fatal("Failed to get savedata from db", zap.Error(err))