Use system wide LuaJIT if aviable.

[dragonfireclient.git] / builtin / item.lua

diff --git a/builtin/item.lua b/builtin/item.lua
index 1349fdf63834d133bbb0cf46a5ce22c5a1cc8065..51a17106a60a3b73b31495f76ea0a25c6a6da0ab 100644 (file)
--- a/builtin/item.lua
+++ b/builtin/item.lua
@@ -129,11 +129,18 @@ function minetest.item_place_node(itemstack, placer, pointed_thing)
        end
 
        local under = pointed_thing.under
-       local oldnode_under = minetest.env:get_node(under)
+       local oldnode_under = minetest.env:get_node_or_nil(under)
+       local above = pointed_thing.above
+       local oldnode_above = minetest.env:get_node_or_nil(above)
+
+       if not oldnode_under or not oldnode_above then
+               minetest.log("info", placer:get_player_name() .. " tried to place"
+                       .. " node in unloaded position " .. minetest.pos_to_string(above))
+               return itemstack
+       end
+
        local olddef_under = ItemStack({name=oldnode_under.name}):get_definition()
        olddef_under = olddef_under or minetest.nodedef_default
-       local above = pointed_thing.above
-       local oldnode_above = minetest.env:get_node(above)
        local olddef_above = ItemStack({name=oldnode_above.name}):get_definition()
        olddef_above = olddef_above or minetest.nodedef_default
 
@@ -237,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