luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-21 20:05:45 +02:00
Code Activity

Removing changes

Browse Source
This commit is contained in:
Foghrye4
2016-04-19 21:33:14 +04:00
parent 9c218eabcd
commit 15b22f9245
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/mainmenu/common.lua
View File

@@ -290,11 +290,7 @@ end
--------------------------------------------------------------------------------
function is_server_protocol_compat(server_proto_min, server_proto_max)
<<<<<<< HEAD
return min_supp_proto <= (server_proto_max or 24) and max_supp_proto >= (server_proto_min or 13)
=======
return not ((min_supp_proto > (server_proto_max or 24)) or (max_supp_proto < (server_proto_min or 13)))
>>>>>>> bca616493783b18b2f280d4773cb4be41d01c434
end
--------------------------------------------------------------------------------
function is_server_protocol_compat_or_error(server_proto_min, server_proto_max)