BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix ask_reconnect_on_crash option being ignored

Browse Source 
Since commit

3b50b2766aeb09c9fc0ad0ea07426bb2187df3d7 "Optional reconnect functionality"

there is a config option named ask_reconnect_on_crash.
It asks the client to reconnect to the server if the server crashed.
It has been implemeted and works, but due to a function parameter not
being passed it never showed effect. This patch adds the parameter
and fixes the bug.

Also fixes the `reconnect` option of minetest.request_shutdown being ignored.
This commit is contained in:
orwell96 2016-03-11 18:41:56 +01:00 committed by est31
parent 6f325070dd
commit 0d2df732e5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server.cpp
View File

@ -2568,7 +2568,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 :