Use system wide LuaJIT if aviable.

[dragonfireclient.git] / builtin / item.lua

diff --git a/builtin/item.lua b/builtin/item.lua
index a28798d4d3a21be5f5736dede4d875fd3cd72b81..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
 
@@ -141,7 +148,7 @@ function minetest.item_place_node(itemstack, placer, pointed_thing)
                minetest.log("info", placer:get_player_name() .. " tried to place"
                        .. " node in invalid position " .. minetest.pos_to_string(above)
                        .. ", replacing " .. oldnode_above.name)
-               return
+               return itemstack
        end
 
        -- Place above pointed node
@@ -186,7 +193,7 @@ function minetest.item_place_node(itemstack, placer, pointed_thing)
                not check_attached_node(place_to, newnode) then
                minetest.log("action", "attached node " .. def.name ..
                        " can not be placed at " .. minetest.pos_to_string(place_to))
-               return
+               return itemstack
        end
 
        -- Add node and update
@@ -237,16 +244,14 @@ 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
-                       minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, n, placer)
-                       return
+                       return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, n, placer, itemstack) or itemstack
                end
        end
 
        if itemstack:get_definition().type == "node" then
                return minetest.item_place_node(itemstack, placer, pointed_thing)
-       elseif itemstack:get_definition().type ~= "none" then
-               return minetest.item_place_object(itemstack, placer, pointed_thing)
        end
+       return itemstack
 end
 
 function minetest.item_drop(itemstack, dropper, pos)
@@ -263,7 +268,7 @@ function minetest.item_drop(itemstack, dropper, pos)
        else
                minetest.env:add_item(pos, itemstack)
        end
-       return ""
+       return ItemStack("")
 end
 
 function minetest.item_eat(hp_change, replace_with_item)
@@ -292,7 +297,15 @@ function minetest.handle_node_drops(pos, drops, digger)
        if digger:get_inventory() then
                local _, dropped_item
                for _, dropped_item in ipairs(drops) do
-                       digger:get_inventory():add_item("main", dropped_item)
+                       local left = digger:get_inventory():add_item("main", dropped_item)
+                       if not left:is_empty() then
+                               local p = {
+                                       x = pos.x + math.random()/2-0.25,
+                                       y = pos.y + math.random()/2-0.25,
+                                       z = pos.z + math.random()/2-0.25,
+                               }
+                               minetest.env:add_item(p, left)
+                       end
                end
        end
 end