From 4a7cde77ea359fade37d27599ee8584740ef0bc5 Mon Sep 17 00:00:00 2001 From: wish Date: Tue, 1 Nov 2022 10:49:28 +1100 Subject: [PATCH] fix nil StrConv on save --- server/channelserver/handlers_data.go | 4 ++-- server/channelserver/sys_session.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/channelserver/handlers_data.go b/server/channelserver/handlers_data.go index b641d3973..28521d10d 100644 --- a/server/channelserver/handlers_data.go +++ b/server/channelserver/handlers_data.go @@ -2,6 +2,7 @@ package channelserver import ( "encoding/hex" + "erupe-ce/common/bfutil" "erupe-ce/common/stringsupport" "fmt" "io" @@ -9,7 +10,6 @@ import ( "os" "path/filepath" - "erupe-ce/common/bfutil" "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" "erupe-ce/server/channelserver/compression/deltacomp" @@ -49,7 +49,7 @@ func handleMsgMhfSavedata(s *Session, p mhfpacket.MHFPacket) { characterSaveData.Save(s) s.logger.Info("Wrote recompressed savedata back to DB.") - characterSaveData.Name = s.clientContext.StrConv.MustDecode(bfutil.UpToNull(characterSaveData.decompSave[88:100])) + characterSaveData.Name = stringsupport.SJISToUTF8(bfutil.UpToNull(characterSaveData.decompSave[88:100])) _, err = s.server.db.Exec("UPDATE characters SET name=$1 WHERE id=$2", characterSaveData.Name, s.charID) if err != nil { s.logger.Fatal("Failed to update character name in db", zap.Error(err)) diff --git a/server/channelserver/sys_session.go b/server/channelserver/sys_session.go index 4e7429bf8..39a96f40f 100644 --- a/server/channelserver/sys_session.go +++ b/server/channelserver/sys_session.go @@ -72,7 +72,7 @@ func NewSession(server *Server, conn net.Conn) *Session { rawConn: conn, cryptConn: network.NewCryptConn(conn), sendPackets: make(chan packet, 20), - clientContext: &clientctx.ClientContext{}, + clientContext: &clientctx.ClientContext{}, // Unused sessionStart: Time_Current_Adjusted().Unix(), stageMoveStack: stringstack.New(), }