nalc/nalc_game
1
0
Fork 1
forked from minetest/minetest_game
Code Issues Pull Requests Releases Wiki Activity

Remove set_inventory_formspec in default, remove delay in sfinv

Browse Source
This commit is contained in:
sfan5 2017-05-17 20:56:39 +02:00 committed by paramat
parent d104b9b10f
commit b25317fc64
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mods/creative/inventory.lua
View File

@ -33,16 +33,14 @@ function creative.init_creative_inventory(player)
end, end,
}, player_name) }, player_name)
creative.update_creative_inventory(player_name, minetest.registered_items) return player_inventory[player_name]
end end
function creative.update_creative_inventory(player_name, tab_content) function creative.update_creative_inventory(player_name, tab_content)
local creative_list = {} local creative_list = {}
local player_inv = minetest.get_inventory({type = "detached", name = "creative_" .. player_name}) local inv = player_inventory[player_name] or
local inv = player_inventory[player_name]
if not inv then
creative.init_creative_inventory(minetest.get_player_by_name(player_name)) creative.init_creative_inventory(minetest.get_player_by_name(player_name))
end local player_inv = minetest.get_inventory({type = "detached", name = "creative_" .. player_name})
for name, def in pairs(tab_content) do for name, def in pairs(tab_content) do
if not (def.groups.not_in_creative_inventory == 1) and if not (def.groups.not_in_creative_inventory == 1) and
@ -161,7 +159,7 @@ function creative.register_tab(name, title, items)
end end
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
creative.init_creative_inventory(player) creative.update_creative_inventory(player:get_player_name(), minetest.registered_items)
end) end)
creative.register_tab("all", "All", minetest.registered_items) creative.register_tab("all", "All", minetest.registered_items)

5
mods/default/player.lua
View File

@ -95,11 +95,6 @@ minetest.register_on_joinplayer(function(player)
default.player_set_model(player, "character.b3d") default.player_set_model(player, "character.b3d")
player:set_local_animation({x=0, y=79}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 30) player:set_local_animation({x=0, y=79}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 30)
-- set GUI
if not (creative and creative.is_enabled_for
and creative.is_enabled_for(player:get_player_name())) then
player:set_inventory_formspec(default.gui_survival_form)
end
player:hud_set_hotbar_image("gui_hotbar.png") player:hud_set_hotbar_image("gui_hotbar.png")
player:hud_set_hotbar_selected_image("gui_hotbar_selected.png") player:hud_set_hotbar_selected_image("gui_hotbar_selected.png")
end) end)

2
mods/sfinv/api.lua
View File

@ -129,9 +129,7 @@ end
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
if sfinv.enabled then if sfinv.enabled then
minetest.after(0.5, function()
sfinv.set_player_inventory_formspec(player) sfinv.set_player_inventory_formspec(player)
end)
end end
end) end)