diff options
| author | ForesterDev <11771800+ForesterDev@users.noreply.github.com> | 2020-02-23 00:31:37 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-22 21:31:37 +0100 |
| commit | 69231581e4f2d78384d3efe6f613be1b78e9d40f (patch) | |
| tree | 7c5c6cc74c1dbade0e8c52dcc153110f6ff78de6 /src/server/game | |
| parent | c65ba35269a68c94c3e423f78fa1585f9d89dd04 (diff) | |
Core/Server: correct timestamp format for shutdown/restart notification broadcasts (#24181)
* Core/SmartScripts: implement SMART_ACTION_OVERRIDE_LIGHT and SMART_ACTION_OVERRIDE_WEATHER
* Core/Server: correct timestamp format for shutdown/restart notification broadcasts
* remove unexpected changes
* move enum from Common to Util
* Use enum class instead of enum
* Fix width for seconds 0 to 9
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Tickets/TicketMgr.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Warden/Warden.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp index ea15b0fefd1..dfa8abcd015 100644 --- a/src/server/game/Tickets/TicketMgr.cpp +++ b/src/server/game/Tickets/TicketMgr.cpp @@ -178,8 +178,8 @@ std::string GmTicket::FormatMessageString(ChatHandler& handler, bool detailed) c std::stringstream ss; ss << handler.PGetParseString(LANG_COMMAND_TICKETLISTGUID, _id); ss << handler.PGetParseString(LANG_COMMAND_TICKETLISTNAME, _playerName.c_str()); - ss << handler.PGetParseString(LANG_COMMAND_TICKETLISTAGECREATE, (secsToTimeString(curTime - _createTime, true, false)).c_str()); - ss << handler.PGetParseString(LANG_COMMAND_TICKETLISTAGE, (secsToTimeString(curTime - _lastModifiedTime, true, false)).c_str()); + ss << handler.PGetParseString(LANG_COMMAND_TICKETLISTAGECREATE, (secsToTimeString(curTime - _createTime, TimeFormat::ShortText)).c_str()); + ss << handler.PGetParseString(LANG_COMMAND_TICKETLISTAGE, (secsToTimeString(curTime - _lastModifiedTime, TimeFormat::ShortText)).c_str()); std::string name; if (sCharacterCache->GetCharacterNameByGuid(_assignedTo, name)) diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp index 635d45eb383..5f2645f4992 100644 --- a/src/server/game/Warden/Warden.cpp +++ b/src/server/game/Warden/Warden.cpp @@ -109,7 +109,7 @@ void Warden::Update() if (_clientResponseTimer > maxClientResponseDelay * IN_MILLISECONDS) { TC_LOG_WARN("warden", "%s (latency: %u, IP: %s) exceeded Warden module response delay for more than %s - disconnecting client", - _session->GetPlayerInfo().c_str(), _session->GetLatency(), _session->GetRemoteAddress().c_str(), secsToTimeString(maxClientResponseDelay, true).c_str()); + _session->GetPlayerInfo().c_str(), _session->GetLatency(), _session->GetRemoteAddress().c_str(), secsToTimeString(maxClientResponseDelay, TimeFormat::ShortText).c_str()); _session->KickPlayer(); } else diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 32ed92267ee..19724b603f5 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2958,7 +2958,7 @@ void World::ShutdownMsg(bool show, Player* player, const std::string& reason) (m_ShutdownTimer < 12 * HOUR && (m_ShutdownTimer % HOUR) == 0) || // < 12 h ; every 1 h (m_ShutdownTimer > 12 * HOUR && (m_ShutdownTimer % (12 * HOUR)) == 0)) // > 12 h ; every 12 h { - std::string str = secsToTimeString(m_ShutdownTimer); + std::string str = secsToTimeString(m_ShutdownTimer, TimeFormat::Numeric); if (!reason.empty()) str += " - " + reason; |