Skip to content

Commit 29b0dc8

Browse files
committed
Fix single click world select
1 parent 85f3d57 commit 29b0dc8

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

builtin/mainmenu/common.lua

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ function menu_worldmt(selected, setting, value)
307307
local filename = world.path .. DIR_DELIM .. "world.mt"
308308
local world_conf = Settings(filename)
309309

310-
if value then
310+
if value ~= nil then
311311
if not world_conf:write() then
312312
core.log("error", "Failed to write world config file")
313313
end
@@ -320,14 +320,14 @@ function menu_worldmt(selected, setting, value)
320320
end
321321
end
322322

323-
function menu_worldmt_legacy()
324-
local modes = {"creative_mode", "enable_damage"}
325-
for _, mode in pairs(modes) do
326-
local mode = menu_worldmt(selected, ""..mode.."")
327-
if mode then
328-
core.setting_set(""..mode.."", mode)
323+
function menu_worldmt_legacy(selected)
324+
local modes_names = {"creative_mode", "enable_damage"}
325+
for _, mode_name in pairs(modes_names) do
326+
local mode_val = menu_worldmt(selected, mode_name)
327+
if mode_val ~= nil then
328+
core.setting_set(mode_name, mode_val)
329329
else
330-
menu_worldmt(selected, ""..mode.."", core.setting_get(""..mode..""))
330+
menu_worldmt(selected, mode_name, core.setting_get(mode_name))
331331
end
332332
end
333333
end

builtin/mainmenu/tab_server.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ local function main_button_handler(this, fields, name, tabdata)
6969
local event = core.explode_textlist_event(fields["srv_worlds"])
7070
local selected = core.get_textlist_index("srv_worlds")
7171

72-
menu_worldmt_legacy()
72+
menu_worldmt_legacy(selected)
7373

7474
if event.type == "DCL" then
7575
world_doubleclick = true

builtin/mainmenu/tab_singleplayer.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ local function main_button_handler(this, fields, name, tabdata)
107107
local event = core.explode_textlist_event(fields["sp_worlds"])
108108
local selected = core.get_textlist_index("sp_worlds")
109109

110-
menu_worldmt_legacy()
110+
menu_worldmt_legacy(selected)
111111

112112
if event.type == "DCL" then
113113
world_doubleclick = true

0 commit comments

Comments
 (0)