Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-03-24 16:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore(merge): merge main into develop

Browse Source 
Resolves CHANGELOG.md conflict: preserve develop's [Unreleased] block,
insert the [9.3.1] section from main, remove the duplicate
DisableSaveIntegrityCheck entry that had been in [Unreleased].
This commit is contained in:
Houmgaor
2026-03-23 11:15:20 +01:00
parent e6a415310f e1aa863a1f
commit d1d3bb8698
20 changed files with 279 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/channelserver/repo_mocks_test.go
View File

@@ -133,6 +133,7 @@ type mockCharacterRepo struct {
loadSaveDataData []byte
loadSaveDataNew bool
loadSaveDataName string
loadSaveDataHash []byte
loadSaveDataErr error
// ReadEtcPoints mock fields
@@ -245,7 +246,7 @@ func (m *mockCharacterRepo) SaveBackup(_ uint32, _ int, _ []byte) error {
func (m *mockCharacterRepo) GetLastBackupTime(_ uint32) (time.Time, error) { return time.Time{}, nil }
func (m *mockCharacterRepo) SaveCharacterDataAtomic(_ SaveAtomicParams) error { return nil }
func (m *mockCharacterRepo) LoadSaveDataWithHash(_ uint32) (uint32, []byte, bool, string, []byte, error) {
return m.loadSaveDataID, m.loadSaveDataData, m.loadSaveDataNew, m.loadSaveDataName, nil, m.loadSaveDataErr
return m.loadSaveDataID, m.loadSaveDataData, m.loadSaveDataNew, m.loadSaveDataName, m.loadSaveDataHash, m.loadSaveDataErr
}
func (m *mockCharacterRepo) LoadBackupsByRecency(_ uint32) ([]SavedataBackup, error) {
return []SavedataBackup{}, nil