mirror of https://github.com/minetest/minetest.git
Fix ask_reconnect_on_crash config option being ignored.
This commit is contained in:
parent
7706cb224b
commit
b2a8ff24f8
|
@ -486,7 +486,7 @@ void Server::step(float dtime)
|
||||||
if (!m_simple_singleplayer_mode) {
|
if (!m_simple_singleplayer_mode) {
|
||||||
m_env->kickAllPlayers(SERVER_ACCESSDENIED_CRASH,
|
m_env->kickAllPlayers(SERVER_ACCESSDENIED_CRASH,
|
||||||
g_settings->get("kick_msg_crash"),
|
g_settings->get("kick_msg_crash"),
|
||||||
g_settings->getBool("ask_reconnect_on_crash"));
|
true);//g_settings->getBool("ask_reconnect_on_crash"));
|
||||||
}
|
}
|
||||||
throw ServerError(async_err);
|
throw ServerError(async_err);
|
||||||
}
|
}
|
||||||
|
@ -2565,7 +2565,7 @@ void Server::DenyAccessVerCompliant(u16 peer_id, u16 proto_ver, AccessDeniedCode
|
||||||
const std::string &str_reason, bool reconnect)
|
const std::string &str_reason, bool reconnect)
|
||||||
{
|
{
|
||||||
if (proto_ver >= 25) {
|
if (proto_ver >= 25) {
|
||||||
SendAccessDenied(peer_id, reason, str_reason);
|
SendAccessDenied(peer_id, reason, str_reason, reconnect);
|
||||||
} else {
|
} else {
|
||||||
std::wstring wreason = utf8_to_wide(
|
std::wstring wreason = utf8_to_wide(
|
||||||
reason == SERVER_ACCESSDENIED_CUSTOM_STRING ? str_reason :
|
reason == SERVER_ACCESSDENIED_CUSTOM_STRING ? str_reason :
|
||||||
|
|
Loading…
Reference in New Issue