From b2a8ff24f87e76f8bdad2a6771c0f6774a217f86 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Fri, 11 Mar 2016 18:41:56 +0100 Subject: [PATCH] Fix ask_reconnect_on_crash config option being ignored. --- src/server.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index 86096055d..b4d78682d 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -486,7 +486,7 @@ void Server::step(float dtime) if (!m_simple_singleplayer_mode) { m_env->kickAllPlayers(SERVER_ACCESSDENIED_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); } @@ -2565,7 +2565,7 @@ void Server::DenyAccessVerCompliant(u16 peer_id, u16 proto_ver, AccessDeniedCode const std::string &str_reason, bool reconnect) { if (proto_ver >= 25) { - SendAccessDenied(peer_id, reason, str_reason); + SendAccessDenied(peer_id, reason, str_reason, reconnect); } else { std::wstring wreason = utf8_to_wide( reason == SERVER_ACCESSDENIED_CUSTOM_STRING ? str_reason :