summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorWeblate <42@minetest.ru>2013-04-03 20:32:13 +0200
committerWeblate <42@minetest.ru>2013-04-03 20:32:13 +0200
commit82709549ff61b4963e8b446fca4ead114650ce1a (patch)
tree691bea32cd002742a6f844b2fe4e74a08aa95296 /builtin
parent6e96bc98ded56ebefb5e597f3d8bee4d4d692dd8 (diff)
parent9ff8012655f13269f33d406f024374c67b650a9a (diff)
downloadminetest-82709549ff61b4963e8b446fca4ead114650ce1a.tar.gz
minetest-82709549ff61b4963e8b446fca4ead114650ce1a.tar.bz2
minetest-82709549ff61b4963e8b446fca4ead114650ce1a.zip
Merge remote branch 'origin/master'
Diffstat (limited to 'builtin')
-rw-r--r--builtin/item.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/item.lua b/builtin/item.lua
index 8e2f75a1a..51a17106a 100644
--- a/builtin/item.lua
+++ b/builtin/item.lua
@@ -244,7 +244,7 @@ function minetest.item_place(itemstack, placer, pointed_thing)
local n = minetest.env:get_node(pointed_thing.under)
local nn = n.name
if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].on_rightclick then
- return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, n, placer, itemstack)
+ return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, n, placer, itemstack) or itemstack
end
end