Skip to content

Commit

Permalink
Fix crash when sfinv not installed
Browse files Browse the repository at this point in the history
Also remove the optional dependency on default
  • Loading branch information
Amaz1 authored and rubenwardy committed Aug 6, 2018
1 parent 8d56fc3 commit 75c9240
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
1 change: 0 additions & 1 deletion depends.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
sfinv?
default?
awards?
29 changes: 15 additions & 14 deletions gui.lua
Original file line number Diff line number Diff line change
Expand Up @@ -191,21 +191,22 @@ function crafting.result_select_on_receive_results(player, type, level, context,
end
end


sfinv.override_page("sfinv:crafting", {
get = function(self, player, context)
local formspec = crafting.make_result_selector(player, "inv", 1, { x = 8, y = 3 }, context)
formspec = formspec .. "list[detached:creative_trash;main;0,3.4;1,1;]" ..
"image[0.05,3.5;0.8,0.8;creative_trash_icon.png]"
return sfinv.make_formspec(player, context, formspec, true)
end,
on_player_receive_fields = function(self, player, context, fields)
if crafting.result_select_on_receive_results(player, "inv", 1, context, fields) then
sfinv.set_player_inventory_formspec(player)
if minetest.global_exists("sfinv") then
sfinv.override_page("sfinv:crafting", {
get = function(self, player, context)
local formspec = crafting.make_result_selector(player, "inv", 1, { x = 8, y = 3 }, context)
formspec = formspec .. "list[detached:creative_trash;main;0,3.4;1,1;]" ..
"image[0.05,3.5;0.8,0.8;creative_trash_icon.png]"
return sfinv.make_formspec(player, context, formspec, true)
end,
on_player_receive_fields = function(self, player, context, fields)
if crafting.result_select_on_receive_results(player, "inv", 1, context, fields) then
sfinv.set_player_inventory_formspec(player)
end
return true
end
return true
end
})
})
end

local node_fs_context = {}
local node_serial = 0
Expand Down

0 comments on commit 75c9240

Please sign in to comment.