Minor cleanup

This commit is contained in:
Jean-Patrick Guerrero 2021-01-02 12:46:34 +01:00
parent 222ae80d93
commit a97d1ce163

View File

@ -871,11 +871,11 @@ end
local function __sort(inv, reverse) local function __sort(inv, reverse)
sort(inv, function(a, b) sort(inv, function(a, b)
if type(a) ~= "string" then if not is_str(a) then
a = a:get_name() a = a:get_name()
end end
if type(b) ~= "string" then if not is_str(b) then
b = b:get_name() b = b:get_name()
end end
@ -1859,6 +1859,7 @@ core.register_on_player_inventory_action(function(player, action, inv, info)
end) end)
if rawget(_G, "armor") then if rawget(_G, "armor") then
__3d_armor = true
armor:register_on_update(set_fs) armor:register_on_update(set_fs)
end end
@ -2138,10 +2139,6 @@ on_mods_loaded(function()
if unified_inventory then if unified_inventory then
function unified_inventory.set_inventory_formspec() return end function unified_inventory.set_inventory_formspec() return end
end end
if rawget(_G, "armor") then
__3d_armor = true
end
end) end)
on_joinplayer(function(player) on_joinplayer(function(player)