X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=itemframe.lua;h=66d690cf43e01ad396f295f95e2ec8e776b47337;hb=fa0d47380c96ce3cb06084484f665ca8fe977d84;hp=d766ce88d5b854e0cf12a191b9eb4acd72845edf;hpb=55ed70b08c3fbc391b24da0d44b1350890eaf9d0;p=xdecor.git

diff --git a/itemframe.lua b/itemframe.lua
index d766ce8..66d690c 100644
--- 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