Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2024-09-22 21:56:15 +08:00
195 changed files with 1915 additions and 1883 deletions

View File

@@ -90,7 +90,7 @@ std::string secsToTimeString(uint64 timeInSecs, bool shortText)
{
ss << minutes << (shortText ? "m" : " minute(s) ");
}
if (secs || (!days && !hours && !minutes) )
if (secs || (!days && !hours && !minutes))
{
ss << secs << (shortText ? "s" : " second(s) ");
}