Mainmenu: fix server_id detection
parent
f4ffb67805
commit
f884d0ace9
|
@ -62,14 +62,14 @@ function order_favorite_list(list)
|
|||
-- orders the multicraft list before support
|
||||
for i = 1, #list do
|
||||
local fav = list[i]
|
||||
if fav.server_id ~= nil then
|
||||
if fav.server_id == "multicraft" then
|
||||
res[#res + 1] = fav
|
||||
end
|
||||
end
|
||||
for i = 1, #list do
|
||||
local fav = list[i]
|
||||
if is_server_protocol_compat(fav.proto_min, fav.proto_max) and
|
||||
fav.server_id == nil then
|
||||
fav.server_id ~= "multicraft" then
|
||||
res[#res + 1] = fav
|
||||
end
|
||||
end
|
||||
|
@ -144,8 +144,10 @@ function render_serverlist_row(spec, is_favorite, is_approved)
|
|||
details = details .. "5,"
|
||||
elseif spec.pvp then
|
||||
details = details .. "6,"
|
||||
else -- damage
|
||||
elseif spec.damage then
|
||||
details = details .. "4,"
|
||||
else
|
||||
details = details .. "0,"
|
||||
end
|
||||
|
||||
return details .. (grey_out and '#aaaaaa,' or ',') .. text
|
||||
|
|
|
@ -112,7 +112,7 @@ local function get_formspec(_, _, tabdata)
|
|||
end
|
||||
|
||||
retval = retval .. render_serverlist_row(server, server.is_favorite,
|
||||
server.server_id ~= nil)
|
||||
server.server_id == "multicraft")
|
||||
end
|
||||
elseif #menudata.favorites > 0 then
|
||||
local favs = core.get_favorites("local")
|
||||
|
@ -130,10 +130,10 @@ local function get_formspec(_, _, tabdata)
|
|||
end
|
||||
end
|
||||
retval = retval .. render_serverlist_row(menudata.favorites[1], (#favs > 0),
|
||||
menudata.favorites[1].server_id ~= nil)
|
||||
menudata.favorites[1].server_id == "multicraft")
|
||||
for i = 2, #menudata.favorites do
|
||||
retval = retval .. "," .. render_serverlist_row(menudata.favorites[i],
|
||||
(i <= #favs), menudata.favorites[i].server_id ~= nil)
|
||||
(i <= #favs), menudata.favorites[i].server_id == "multicraft")
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -357,7 +357,7 @@ local function main_button_handler(_, fields, _, tabdata)
|
|||
|
||||
local auto_connect = false
|
||||
for _, server in pairs(serverlist) do
|
||||
if server.server_id and server.address == gamedata.address then
|
||||
if server.server_id == "multicraft" and server.address == gamedata.address then
|
||||
auto_connect = true
|
||||
break
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue