diff --git a/ui/inbox.lua b/ui/inbox.lua index 44fa5a8..b157e3f 100644 --- a/ui/inbox.lua +++ b/ui/inbox.lua @@ -2,8 +2,10 @@ local S = minetest.get_translator("mail") function mail.show_inbox(name, sortfieldindex, sortdirection, filter) - sortfieldindex = tonumber(sortfieldindex or mail.selected_idxs.sortfield[name]) or mail.get_setting(name, "defaultsortfield") or 3 - sortdirection = sortdirection or mail.selected_idxs.sortdirection[name] or tostring(mail.get_setting(name, "defaultsortdirection")) or "1" + sortfieldindex = tonumber(sortfieldindex or mail.selected_idxs.sortfield[name]) + or mail.get_setting(name, "defaultsortfield") or 3 + sortdirection = sortdirection or mail.selected_idxs.sortdirection[name] + or tostring(mail.get_setting(name, "defaultsortdirection")) or "1" filter = filter or mail.selected_idxs.filter[name] or "" mail.selected_idxs.inbox[name] = mail.selected_idxs.inbox[name] or {} diff --git a/ui/outbox.lua b/ui/outbox.lua index 3a0a7e3..c4e0be1 100644 --- a/ui/outbox.lua +++ b/ui/outbox.lua @@ -2,8 +2,10 @@ local S = minetest.get_translator("mail") function mail.show_sent(name, sortfieldindex, sortdirection, filter) - sortfieldindex = tonumber(sortfieldindex or mail.selected_idxs.sortfield[name]) or 3 - sortdirection = sortdirection or mail.selected_idxs.sortdirection[name] or "1" + sortfieldindex = tonumber(sortfieldindex or mail.selected_idxs.sortfield[name]) + or mail.get_setting(name, "defaultsortfield") or 3 + sortdirection = sortdirection or mail.selected_idxs.sortdirection[name] + or tostring(mail.get_setting(name, "defaultsortdirection")) or "1" filter = filter or mail.selected_idxs.filter[name] or "" mail.selected_idxs.sent[name] = mail.selected_idxs.sent[name] or {} diff --git a/ui/settings.lua b/ui/settings.lua index 256f4a5..13bff88 100644 --- a/ui/settings.lua +++ b/ui/settings.lua @@ -52,7 +52,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) if fields.back then mail.show_mail_menu(playername) return - + elseif fields.reset then mail.reset_settings(playername) @@ -100,7 +100,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) } mail.set_setting(playername, setting) end - + mail.show_settings(playername) return end)