evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update StarPlayerStorage.cpp

Browse Source
This commit is contained in:
Kae 2023-11-27 10:13:21 +11:00
parent ac66491b3f
commit 24c2820ce1
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/game/StarPlayerStorage.cpp
View File

@ -64,7 +64,12 @@ PlayerStorage::PlayerStorage(String const& storageDir) {
if (player->uuid() != entry.first) if (player->uuid() != entry.first)
throw PlayerException(strf("Uuid mismatch in loaded player with filename uuid '{}'", entry.first.hex())); throw PlayerException(strf("Uuid mismatch in loaded player with filename uuid '{}'", entry.first.hex()));
} catch (StarException const& e) { } catch (StarException const& e) {
Logger::error("Failed to valid player with uuid {} : {}", entry.first.hex(), outputException(e, true)); auto& fileName = uuidFileName(entry.first);
String uuidHex = entry.first.hex();
if (uuidHex == fileName)
Logger::error("Failed to validate player with uuid {} : {}", uuidHex, outputException(e, true));
else
Logger::error("Failed to validate player with uuid {} ({}.player) : {}", uuidHex, fileName, outputException(e, true));
it.remove(); it.remove();
} }
} }
@ -76,8 +81,11 @@ PlayerStorage::PlayerStorage(String const& storageDir) {
m_metadata = Json::parseJson(File::readFileString(filename)).toObject(); m_metadata = Json::parseJson(File::readFileString(filename)).toObject();
if (auto order = m_metadata.value("order")) { if (auto order = m_metadata.value("order")) {
for (auto const& uuid : order.iterateArray()) for (auto const& jUuid : order.iterateArray()) {
m_savedPlayersCache.toBack(Uuid(uuid.toString())); auto entry = m_savedPlayersCache.find(Uuid(jUuid.toString()));
if (entry != m_savedPlayersCache.end())
m_savedPlayersCache.toBack(entry);
}
} }
} catch (std::exception const& e) { } catch (std::exception const& e) {
Logger::warn("Error loading player storage metadata file, resetting: {}", outputException(e, false)); Logger::warn("Error loading player storage metadata file, resetting: {}", outputException(e, false));