Fix ask_reconnect_on_crash option being ignored

orwell96 · est31 · commit 0d2df732e5c5 · 2016-03-11T23:43:37.000+01:00
Since commit 3b50b27 "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.
diff --git a/src/server.cpp b/src/server.cpp
@@ -2568,7 +2568,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 :

Original file line number	Diff line number	Diff line change
`@@ -2568,7 +2568,7 @@ void Server::DenyAccessVerCompliant(u16 peer_id, u16 proto_ver, AccessDeniedCode`
`2568`	`2568`	`const std::string &str_reason, bool reconnect)`
`2569`	`2569`	`{`
`2570`	`2570`	`if (proto_ver >= 25) {`
`2571`		`- SendAccessDenied(peer_id, reason, str_reason);`
	`2571`	`+ SendAccessDenied(peer_id, reason, str_reason, reconnect);`
`2572`	`2572`	`} else {`
`2573`	`2573`	`std::wstring wreason = utf8_to_wide(`
`2574`	`2574`	`reason == SERVER_ACCESSDENIED_CUSTOM_STRING ? str_reason :`