Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-13 23:44:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

loaddata fallback

Browse Source
This commit is contained in:
wish
2022-08-12 15:13:31 +10:00
parent 263ce50569
commit ce31b248eb
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/channelserver/handlers_data.go
View File

@@ -297,10 +297,11 @@ func handleMsgMhfLoaddata(s *Session, p mhfpacket.MHFPacket) {
} }
var data []byte 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 || len(data) == 0 {
s.logger.Fatal("Failed to get savedata from db", zap.Error(err)) s.logger.Warn(fmt.Sprintf("Failed to load savedata (CID: %d)", s.charID), zap.Error(err))
s.rawConn.Close() // Terminate the connection
return
} }
doAckBufSucceed(s, pkt.AckHandle, data) doAckBufSucceed(s, pkt.AckHandle, data)
@@ -310,11 +311,11 @@ func handleMsgMhfLoaddata(s *Session, p mhfpacket.MHFPacket) {
} }
bf := byteframe.NewByteFrameFromBytes(decompSaveData) bf := byteframe.NewByteFrameFromBytes(decompSaveData)
bf.Seek(88, io.SeekStart) bf.Seek(88, io.SeekStart)
binary1 := bf.ReadNullTerminatedBytes() name := bf.ReadNullTerminatedBytes()
s.server.userBinaryPartsLock.Lock() s.server.userBinaryPartsLock.Lock()
s.server.userBinaryParts[userBinaryPartID{charID: s.charID, index: 1}] = append(binary1, []byte{0x00}...) s.server.userBinaryParts[userBinaryPartID{charID: s.charID, index: 1}] = append(name, []byte{0x00}...)
s.server.userBinaryPartsLock.Unlock() s.server.userBinaryPartsLock.Unlock()
s.Name = stringsupport.SJISToUTF8(binary1) s.Name = stringsupport.SJISToUTF8(name)
} }
func handleMsgMhfSaveScenarioData(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfSaveScenarioData(s *Session, p mhfpacket.MHFPacket) {