From 9a1d3584c22013860ec4b664858076ab6ddf3ea1 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Wed, 13 Jun 2018 21:58:34 +0200 Subject: Server: move shutdown parts to a specific shutdown state object (#7437) * Server: move shutdown parts to a specific shutdown state object --- src/network/serverpackethandler.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/network') diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index c961d406e..bb5eed92b 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -402,11 +402,8 @@ void Server::handleCommand_ClientReady(NetworkPacket* pkt) m_clients.event(peer_id, CSE_SetClientReady); m_script->on_joinplayer(playersao); // Send shutdown timer if shutdown has been scheduled - if (m_shutdown_timer > 0.0f) { - std::wstringstream ws; - ws << L"*** Server shutting down in " - << duration_to_string(myround(m_shutdown_timer)).c_str() << "."; - SendChatMessage(pkt->getPeerId(), ws.str()); + if (m_shutdown_state.isTimerRunning()) { + SendChatMessage(pkt->getPeerId(), m_shutdown_state.getShutdownTimerMessage()); } } -- cgit v1.2.3