fix binpath reference when overriding saves

This commit is contained in:
wish
2022-08-05 20:47:20 +10:00
parent ea63e3247c
commit 0b90dfd458

View File

@@ -290,21 +290,14 @@ func dumpSaveData(s *Session, data []byte, suffix string) {
func handleMsgMhfLoaddata(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfLoaddata(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfLoaddata) pkt := p.(*mhfpacket.MsgMhfLoaddata)
overrideFile := filepath.Join(".", "bin", "save_override.bin") if _, err := os.Stat(filepath.Join(s.server.erupeConfig.BinPath, "save_override.bin")); err == nil {
var data []byte data, _ := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "save_override.bin"))
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)
}
doAckBufSucceed(s, pkt.AckHandle, data) 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) err := s.server.db.QueryRow("SELECT savedata FROM characters WHERE id = $1", s.charID).Scan(&data)
if err != nil { if err != nil {
s.logger.Fatal("Failed to get savedata from db", zap.Error(err)) s.logger.Fatal("Failed to get savedata from db", zap.Error(err))