Enchant. Table : Fix unknown items when declared tools not registered

[xdecor.git] / itemframe.lua

diff --git a/itemframe.lua b/itemframe.lua
index d766ce88d5b854e0cf12a191b9eb4acd72845edf..66d690cf43e01ad396f295f95e2ec8e776b47337 100644 (file)
--- a/itemframe.lua
+++ b/itemframe.lua
@@ -74,7 +74,7 @@ function itemframe.rightclick(pos, node, clicker, itemstack)
        if player ~= owner or not itemstack then return end
 
        drop_item(pos, node)
-       local itemstring = itemstack:take_item():get_name()
+       local itemstring = itemstack:take_item():to_string()
        meta:set_string("item", itemstring)
        update_item(pos, node)
 
@@ -98,8 +98,6 @@ function itemframe.dig(pos, player)
        return player and pname == owner
 end
 
-minetest.register_alias("xdecor:frame", "xdecor:itemframe")
-
 xdecor.register("itemframe", {
        description = "Item Frame",
        groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3},
@@ -125,6 +123,11 @@ minetest.register_entity("xdecor:f_item", {
        physical = false,
        textures = {"air"},
        on_activate = function(self, staticdata)
+               local pos = self.object:getpos()
+               if minetest.get_node(pos).name ~= "xdecor:itemframe" then
+                       self.object:remove()
+               end
+
                if tmp.nodename and tmp.texture then
                        self.nodename = tmp.nodename
                        tmp.nodename = nil