mirror of
https://github.com/Mezeporta/Erupe.git
synced 2026-03-22 07:32:32 +01:00
fix(handlers): trying to fix issues with incomplete saves.
This commit is contained in:
@@ -184,6 +184,28 @@ func logoutPlayer(s *Session) {
|
||||
delete(s.server.objectIDs, s)
|
||||
s.server.Unlock()
|
||||
|
||||
// Save all character data before logout to prevent data loss
|
||||
// This ensures data is persisted even if client disconnects unexpectedly
|
||||
if s.charID != 0 {
|
||||
characterSaveData, err := GetCharacterSaveData(s, s.charID)
|
||||
if err == nil && characterSaveData != nil {
|
||||
// Force name to match to prevent corruption detection issues
|
||||
characterSaveData.Name = s.Name
|
||||
characterSaveData.updateSaveDataWithStruct()
|
||||
|
||||
// Update playtime in savedata before saving
|
||||
if !s.playtimeTime.IsZero() {
|
||||
s.playtime += uint32(time.Since(s.playtimeTime).Seconds())
|
||||
}
|
||||
characterSaveData.Playtime = s.playtime
|
||||
|
||||
characterSaveData.Save(s)
|
||||
s.logger.Info("Saved character data during logout", zap.Uint32("charID", s.charID))
|
||||
} else if err != nil {
|
||||
s.logger.Warn("Failed to retrieve character save data during logout", zap.Error(err), zap.Uint32("charID", s.charID))
|
||||
}
|
||||
}
|
||||
|
||||
for _, stage := range s.server.stages {
|
||||
// Tell sessions registered to disconnecting players quest to unregister
|
||||
if stage.host != nil && stage.host.charID == s.charID {
|
||||
|
||||
@@ -14,6 +14,7 @@ import (
|
||||
"erupe-ce/network/mhfpacket"
|
||||
"erupe-ce/server/channelserver/compression/deltacomp"
|
||||
"erupe-ce/server/channelserver/compression/nullcomp"
|
||||
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
@@ -62,6 +63,14 @@ func handleMsgMhfSavedata(s *Session, p mhfpacket.MHFPacket) {
|
||||
s.Name = characterSaveData.Name
|
||||
}
|
||||
|
||||
// Force name to match session to prevent corruption detection false positives
|
||||
// This handles SJIS/UTF-8 encoding differences and ensures saves succeed across all game versions
|
||||
if characterSaveData.Name != s.Name && !characterSaveData.IsNewCharacter {
|
||||
s.logger.Info("Correcting name mismatch in savedata", zap.String("savedata_name", characterSaveData.Name), zap.String("session_name", s.Name))
|
||||
characterSaveData.Name = s.Name
|
||||
characterSaveData.updateSaveDataWithStruct()
|
||||
}
|
||||
|
||||
if characterSaveData.Name == s.Name || _config.ErupeConfig.RealClientMode <= _config.S10 {
|
||||
characterSaveData.Save(s)
|
||||
s.logger.Info("Wrote recompressed savedata back to DB.")
|
||||
|
||||
Reference in New Issue
Block a user