oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-27 17:28:41 +00:00
Code Wiki Activity

Clean up Lan Servers being added to serverlistmgr.servers

Browse source
This commit is contained in:
DustyBagel 2025-01-02 02:29:43 -06:00
parent e27bd6a9ae
commit 935b08ac03
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
builtin/mainmenu/serverlistmgr.lua
View file

@ -22,7 +22,7 @@ serverlistmgr = {
-- list of locally favorites servers -- list of locally favorites servers
favorites = nil, favorites = nil,
-- list of servers fetched from public list -- list of servers fetched from public list and local servers
servers = nil, servers = nil,
} }

19
builtin/mainmenu/tab_online.lua
View file

@ -23,24 +23,21 @@ local function get_sorted_servers()
incompatible = {} incompatible = {}
} }
local merged_serverlist = table.copy(serverlistmgr.servers) local serverlist = table.copy(serverlistmgr.servers)
if minetest.settings:get_bool("serverlist_lan") then if minetest.settings:get_bool("serverlist_lan") then
if core.get_lan_servers then local lan_servers = core.get_lan_servers()
local lan = core.get_lan_servers()
for _, server in ipairs(lan) do for _, server in ipairs(lan_servers) do
server.is_compatible = is_server_protocol_compat(server.proto_min, server.proto_max) server.is_compatible = is_server_protocol_compat(server.proto_min, server.proto_max)
server.is_local = true server.is_local = true
table.insert(merged_serverlist, server) table.insert(serverlist, server)
end
else
print("core.get_lan_servers isn't defined.")
end end
end end
local favs = serverlistmgr.get_favorites() local favs = serverlistmgr.get_favorites()
local taken_favs = {} local taken_favs = {}
local result = menudata.search_result or merged_serverlist local result = menudata.search_result or serverlist
for _, server in ipairs(result) do for _, server in ipairs(result) do
server.is_favorite = false server.is_favorite = false
for index, fav in ipairs(favs) do for index, fav in ipairs(favs) do