minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Server kicks: make messages configurable, cache wstring

This commit is contained in:
est31 2015-07-17 06:30:21 +02:00
parent f9dbec6edf
commit bf7174f3f9
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
minetest.conf.example
View File

@ -388,6 +388,12 @@
# "log" = mimic and log backtrace of deprecated call (default for debug). # "log" = mimic and log backtrace of deprecated call (default for debug).
# "error" = abort on usage of deprecated call (suggested for mod developers). # "error" = abort on usage of deprecated call (suggested for mod developers).
#deprecated_lua_api_handling = legacy #deprecated_lua_api_handling = legacy
#kick_msg_shutdown = Server shutting down.
# A message to be displayed to all clients when the server shuts down
#kick_msg_crash = This server has experienced an internal error. You will now be disconnected.
# A message to be displayed to all clients when the server crashes
# Mod profiler # Mod profiler
#mod_profiling = false #mod_profiling = false
# Detailed mod profile data # Detailed mod profile data

3
src/defaultsettings.cpp
View File

@ -252,6 +252,9 @@ void set_default_settings(Settings *settings)
settings->setDefault("deprecated_lua_api_handling", "log"); settings->setDefault("deprecated_lua_api_handling", "log");
#endif #endif
settings->setDefault("kick_msg_shutdown", "Server shutting down.");
settings->setDefault("kick_msg_crash", "This server has experienced an internal error. You will now be disconnected.");
settings->setDefault("profiler_print_interval", "0"); settings->setDefault("profiler_print_interval", "0");
settings->setDefault("enable_mapgen_debug_info", "false"); settings->setDefault("enable_mapgen_debug_info", "false");
settings->setDefault("active_object_send_range_blocks", "3"); settings->setDefault("active_object_send_range_blocks", "3");

3
src/environment.cpp
View File

@ -428,10 +428,11 @@ bool ServerEnvironment::line_of_sight(v3f pos1, v3f pos2, float stepsize, v3s16
void ServerEnvironment::kickAllPlayers(const std::string &reason) void ServerEnvironment::kickAllPlayers(const std::string &reason)
{ {
std::wstring wreason = utf8_to_wide(reason);
for (std::vector<Player*>::iterator it = m_players.begin(); for (std::vector<Player*>::iterator it = m_players.begin();
it != m_players.end(); it != m_players.end();
++it) { ++it) {
((Server*)m_gamedef)->DenyAccess_Legacy((*it)->peer_id, utf8_to_wide(reason)); ((Server*)m_gamedef)->DenyAccess_Legacy((*it)->peer_id, wreason);
} }
} }

6
src/server.cpp
View File

@ -397,8 +397,8 @@ Server::~Server()
infostream << "Server: Saving players" << std::endl; infostream << "Server: Saving players" << std::endl;
m_env->saveLoadedPlayers(); m_env->saveLoadedPlayers();
infostream << "Server: kick players" << std::endl; infostream << "Server: Kicking players" << std::endl;
m_env->kickAllPlayers("Server shutting down..."); m_env->kickAllPlayers(g_settings->get("kick_msg_shutdown"));
infostream << "Server: Saving environment metadata" << std::endl; infostream << "Server: Saving environment metadata" << std::endl;
m_env->saveMeta(); m_env->saveMeta();
@ -502,7 +502,7 @@ void Server::step(float dtime)
throw ServerError(async_err); throw ServerError(async_err);
} }
else { 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. " errorstream << "UNRECOVERABLE error occurred. Stopping server. "
<< "Please fix the following error:" << std::endl << "Please fix the following error:" << std::endl
<< async_err << std::endl; << async_err << std::endl;