From bf7174f3f98f0ac665e093aaa3e332f8bd29b64b Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 17 Jul 2015 06:30:21 +0200 Subject: Server kicks: make messages configurable, cache wstring --- src/server.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server.cpp') diff --git a/src/server.cpp b/src/server.cpp index 0cad82613..2d6de1c9d 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -397,8 +397,8 @@ Server::~Server() infostream << "Server: Saving players" << std::endl; m_env->saveLoadedPlayers(); - infostream << "Server: kick players" << std::endl; - m_env->kickAllPlayers("Server shutting down..."); + infostream << "Server: Kicking players" << std::endl; + m_env->kickAllPlayers(g_settings->get("kick_msg_shutdown")); infostream << "Server: Saving environment metadata" << std::endl; m_env->saveMeta(); @@ -502,7 +502,7 @@ void Server::step(float dtime) throw ServerError(async_err); } else { - m_env->kickAllPlayers("The server has crashed. Disconnecting all players. Please reconnect soon..."); + m_env->kickAllPlayers(g_settings->get("kick_msg_crash")); errorstream << "UNRECOVERABLE error occurred. Stopping server. " << "Please fix the following error:" << std::endl << async_err << std::endl; -- cgit v1.2.3