summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--itemframes/init.lua14
1 files changed, 9 insertions, 5 deletions
diff --git a/itemframes/init.lua b/itemframes/init.lua
index 9c96df8..b6c3446 100644
--- a/itemframes/init.lua
+++ b/itemframes/init.lua
@@ -82,13 +82,17 @@ local update_item = function(pos, node)
e:setyaw(yaw)
end
local idef=minetest.registered_items[stack:get_name()]
- local desc = stack:get_meta():get_string("description")
- local hname = idef.description or stack:get_name()
- if desc and desc ~= "" then
- hname = desc
+ local desc = stack:get_meta():get_string("description") or ""
+ if desc == "" then
+ if idef and idef.description then
+ desc = idef.description
+ else
+ desc = stack:get_name()
+ end
end
+
local owner = meta:get_string("owner")
- meta:set_string("infotext", hname .. " (owned by "..owner..")")
+ meta:set_string("infotext", desc .. " (owned by "..owner..")")
end
end
href='#n88'>88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157