Skip to content
Permalink
Browse files

Fix #5617 - respect message and reconnect parameters when shutting do…

…wn immediately (#5621)
  • Loading branch information...
orwell96 authored and nerzhul committed Apr 21, 2017
1 parent 900b816 commit f151b2322003bbc89c2cd3c603ef1e1ab9d46439
Showing with 8 additions and 4 deletions.
  1. +8 −4 src/server.cpp
@@ -3479,9 +3479,16 @@ v3f Server::findSpawnPos()

void Server::requestShutdown(const std::string &msg, bool reconnect, float delay)
{
m_shutdown_timer = delay;
m_shutdown_msg = msg;
m_shutdown_ask_reconnect = reconnect;

if (delay == 0.0f) {
// No delay, shutdown immediately
m_shutdown_requested = true;
// only print to the infostream, a chat message saying
// "Server Shutting Down" is sent when the server destructs.
infostream << "*** Immediate Server shutdown requested." << std::endl;
} else if (delay < 0.0f && m_shutdown_timer > 0.0f) {
// Negative delay, cancel shutdown if requested
m_shutdown_timer = 0.0f;
@@ -3495,10 +3502,7 @@ void Server::requestShutdown(const std::string &msg, bool reconnect, float delay
infostream << wide_to_utf8(ws.str()).c_str() << std::endl;
SendChatMessage(PEER_ID_INEXISTENT, ws.str());
} else if (delay > 0.0f) {
// Positive delay, delay the shutdown
m_shutdown_timer = delay;
m_shutdown_msg = msg;
m_shutdown_ask_reconnect = reconnect;
// Positive delay, tell the clients when the server will shut down
std::wstringstream ws;

ws << L"*** Server shutting down in "

0 comments on commit f151b23

Please sign in to comment.
You can’t perform that action at this time.