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

Better version match fail messages from server

Browse Source
This commit is contained in:
Perttu Ahola 2011-11-29 22:23:03 +02:00
parent e5d372f238
commit 4bcff65ad0
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/server.cpp
View File

@ -2069,8 +2069,11 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
infostream<<"Server: Cannot negotiate " infostream<<"Server: Cannot negotiate "
"serialization version with peer " "serialization version with peer "
<<peer_id<<std::endl; <<peer_id<<std::endl;
SendAccessDenied(m_con, peer_id, SendAccessDenied(m_con, peer_id, std::wstring(
L"Your client is too old (map format)"); L"Your client's version is not supported.\n"
L"Server version is ")
+ narrow_to_wide(VERSION_STRING) + L"."
);
return; return;
} }
@ -2088,18 +2091,23 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
if(net_proto_version == 0) if(net_proto_version == 0)
{ {
SendAccessDenied(m_con, peer_id, SendAccessDenied(m_con, peer_id, std::wstring(
L"Your client is too old. Please upgrade."); L"Your client's version is not supported.\n"
L"Server version is ")
+ narrow_to_wide(VERSION_STRING) + L"."
);
return; return;
} }
/* Uhh... this should actually be a warning but let's do it like this */
if(g_settings->getBool("strict_protocol_version_checking")) if(g_settings->getBool("strict_protocol_version_checking"))
{ {
if(net_proto_version < PROTOCOL_VERSION) if(net_proto_version != PROTOCOL_VERSION)
{ {
SendAccessDenied(m_con, peer_id, SendAccessDenied(m_con, peer_id, std::wstring(
L"Your client is too old. Please upgrade."); L"Your client's version is not supported.\n"
L"Server version is ")
+ narrow_to_wide(VERSION_STRING) + L"."
);
return; return;
} }
} }