From aa996c52504d5146dc69f902ef13b75b32085dba Mon Sep 17 00:00:00 2001 From: James David Clarke Date: Wed, 17 Jan 2024 13:12:48 +0000 Subject: [PATCH] Use utility function for checking survival/creative mode on player. --- mods/HUD/mcl_inventory/init.lua | 9 ++++----- mods/HUD/mcl_inventory/survival.lua | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/HUD/mcl_inventory/init.lua b/mods/HUD/mcl_inventory/init.lua index 6e9a9e048..2383295bc 100644 --- a/mods/HUD/mcl_inventory/init.lua +++ b/mods/HUD/mcl_inventory/init.lua @@ -86,12 +86,11 @@ end) ---@param player mt.PlayerObjectRef function mcl_inventory.update_inventory(player) - local player_gamemode = player:get_meta():get_string("gamemode") - if player_gamemode == "" then player_gamemode = "survival" end - - if player_gamemode == "creative" then + local player_name = player:get_player_name() + local is_gamemode_creative = minetest.is_creative_enabled(player_name) + if is_gamemode_creative then mcl_inventory.set_creative_formspec(player) - elseif player_gamemode == "survival" then + elseif not is_gamemode_creative then player:set_inventory_formspec(mcl_inventory.build_survival_formspec(player)) end mcl_meshhand.update_player(player) diff --git a/mods/HUD/mcl_inventory/survival.lua b/mods/HUD/mcl_inventory/survival.lua index 0ef889d94..4922c8f88 100644 --- a/mods/HUD/mcl_inventory/survival.lua +++ b/mods/HUD/mcl_inventory/survival.lua @@ -201,8 +201,9 @@ function mcl_inventory.build_survival_formspec(player) end minetest.register_on_player_receive_fields(function(player, formname, fields) + local player_name = player:get_player_name() if formname == "" and #mcl_inventory.registered_survival_inventory_tabs ~= 1 and - player:get_meta():get_string("gamemode") ~= "creative" then + not minetest.is_creative_enabled(player_name) then for _, d in ipairs(mcl_inventory.registered_survival_inventory_tabs) do if fields["tab_" .. d.id] and d.access(player) then player_current_tab[player] = d.id