mirror of
https://git.minetest.land/MineClone2/MineClone2.git
synced 2024-11-28 13:53:45 +01:00
Merge pull request 'Fix creative inventory view being reset upon taking damage' (#3102) from CyberMango/MineClone2:bug/mango/creative_inventory_view_resets_on_damage into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3102 Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land> Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
This commit is contained in:
commit
cbf090485c
@ -699,6 +699,7 @@ minetest.register_on_joinplayer(function(player)
|
||||
players[name].start_i = 0
|
||||
end
|
||||
init(player)
|
||||
-- Setup initial creative inventory to the "nix" page.
|
||||
mcl_inventory.set_creative_formspec(player, 0, 1, nil, false, "nix", "")
|
||||
end)
|
||||
|
||||
|
@ -169,12 +169,6 @@ minetest.register_on_joinplayer(function(player)
|
||||
player:hud_set_hotbar_image("mcl_inventory_hotbar.png")
|
||||
player:hud_set_hotbar_selected_image("mcl_inventory_hotbar_selected.png")
|
||||
|
||||
local old_update_player = mcl_armor.update_player
|
||||
function mcl_armor.update_player(player, info)
|
||||
old_update_player(player, info)
|
||||
set_inventory(player, true)
|
||||
end
|
||||
|
||||
-- In Creative Mode, the initial inventory setup is handled in creative.lua
|
||||
if not minetest.is_creative_enabled(player:get_player_name()) then
|
||||
set_inventory(player)
|
||||
|
Loading…
Reference in New Issue
Block a user