From 159fc8915508bbf7521ac83dfff609773d9ed0c5 Mon Sep 17 00:00:00 2001 From: Paul Ouellette Date: Sat, 19 Jan 2019 22:11:58 -0500 Subject: [PATCH] Refactor make_formspec to always return formspec --- init.lua | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/init.lua b/init.lua index 4dad705..aed1044 100644 --- a/init.lua +++ b/init.lua @@ -393,21 +393,15 @@ local function make_formspec(player_name) fs[#fs + 1] = get_recipe_fs(data, iY) end - fs = concat(fs) - - if sfinv_only then - return fs - else - data.formspec = fs - end + return concat(fs) end local show_fs = function(player, player_name) if sfinv_only then sfinv.set_player_inventory_formspec(player) else - make_formspec(player_name) local data = player_data[player_name] + data.formspec = make_formspec(player_name) show_formspec(player_name, "craftguide", data.formspec) end end @@ -766,12 +760,12 @@ else if not data then init_data(user, player_name) - make_formspec(player_name) data = player_data[player_name] + data.formspec = make_formspec(player_name) elseif progressive_mode then data.progressive_items = get_progressive_items(user) filter_items(data) - make_formspec(player_name) + data.formspec = make_formspec(player_name) end show_formspec(player_name, "craftguide", data.formspec)