minenux/minetest-engine-minecheat
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Fix #5617 - respect message and reconnect parameters when shutting down immediately (#5621)

Browse Source
This commit is contained in:
orwell96 2017-04-21 19:31:59 +02:00 committed by Loïc Blot
parent 900b816162
commit f151b23220
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/server.cpp
View File

@ -3479,9 +3479,16 @@ v3f Server::findSpawnPos()
void Server::requestShutdown(const std::string &msg, bool reconnect, float delay) 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) { if (delay == 0.0f) {
// No delay, shutdown immediately // No delay, shutdown immediately
m_shutdown_requested = true; 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) { } else if (delay < 0.0f && m_shutdown_timer > 0.0f) {
// Negative delay, cancel shutdown if requested // Negative delay, cancel shutdown if requested
m_shutdown_timer = 0.0f; 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; infostream << wide_to_utf8(ws.str()).c_str() << std::endl;
SendChatMessage(PEER_ID_INEXISTENT, ws.str()); SendChatMessage(PEER_ID_INEXISTENT, ws.str());
} else if (delay > 0.0f) { } else if (delay > 0.0f) {
// Positive delay, delay the shutdown // Positive delay, tell the clients when the server will shut down
m_shutdown_timer = delay;
m_shutdown_msg = msg;
m_shutdown_ask_reconnect = reconnect;
std::wstringstream ws; std::wstringstream ws;
ws << L"*** Server shutting down in " ws << L"*** Server shutting down in "