Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2025-04-23 07:35:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix clock update and glow frame item glow

Browse source
This commit is contained in:
cora 2024-01-27 23:55:31 +01:00 • committed by the-real-herowl
parent c0e6e3fb86
commit 91ef5fe7ea
1 changed files with 14 additions and 3 deletions

17
mods/ITEMS/mcl_itemframes/init.lua
View file

@ -134,7 +134,18 @@ function mcl_itemframes.tpl_entity:set_item(itemstack, pos)
update_entity(pos)
return
end
self._itemframe_pos = pos
if pos then
self._itemframe_pos = pos
else
pos = self._itemframe_pos
end
local ndef = minetest.registered_nodes[minetest.get_node(pos).name]
if not ndef._mcl_itemframe then
self.object:remove()
update_entity()
return
end
local def = mcl_itemframes.registered_itemframes[ndef._mcl_itemframe]
self._item = itemstack:get_name()
self._stack = itemstack
self._map_id = get_map_id(itemstack)
@ -151,7 +162,7 @@ function mcl_itemframes.tpl_entity:set_item(itemstack, pos)
end)
return
end
self.object:set_properties(table.merge(base_props, { wield_item = self._item}))
self.object:set_properties(table.merge(base_props, { wield_item = self._item}, def.object_properties or {}))
end
function mcl_itemframes.tpl_entity:get_staticdata()
@ -189,7 +200,7 @@ function mcl_itemframes.tpl_entity:on_step(dtime)
return
end
if minetest.get_item_group(self._item, "clock") > 0 then
self:set_item("mcl_clock:clock_"..mcl_clock.get_clock_frame())
self:set_item(ItemStack("mcl_clock:clock_"..mcl_clock.get_clock_frame()))
end
end