Merge pull request #431 from sapier/dtime_clamping

[oweals/minetest.git] / builtin / item.lua

diff --git a/builtin/item.lua b/builtin/item.lua
index 4be77e1d758171aa85a56088e259339eb4eb6549..1349fdf63834d133bbb0cf46a5ce22c5a1cc8065 100644 (file)
--- a/builtin/item.lua
+++ b/builtin/item.lua
@@ -76,10 +76,10 @@ function minetest.get_node_drops(nodename, toolname)
        local drop = ItemStack({name=nodename}):get_definition().drop
        if drop == nil then
                -- default drop
-               return {ItemStack({name=nodename})}
+               return {nodename}
        elseif type(drop) == "string" then
                -- itemstring drop
-               return {ItemStack(drop)}
+               return {drop}
        elseif drop.items == nil then
                -- drop = {} to disable default drop
                return {}
@@ -141,7 +141,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,17 +186,21 @@ 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
        minetest.env:add_node(place_to, newnode)
 
+       local take_item = true
+
        -- Run callback
        if def.after_place_node then
                -- Copy place_to because callback can modify it
                local place_to_copy = {x=place_to.x, y=place_to.y, z=place_to.z}
-               def.after_place_node(place_to_copy, placer)
+               if def.after_place_node(place_to_copy, placer, itemstack) then
+                       take_item = false
+               end
        end
 
        -- Run script hook
@@ -206,10 +210,14 @@ function minetest.item_place_node(itemstack, placer, pointed_thing)
                local place_to_copy = {x=place_to.x, y=place_to.y, z=place_to.z}
                local newnode_copy = {name=newnode.name, param1=newnode.param1, param2=newnode.param2}
                local oldnode_copy = {name=oldnode.name, param1=oldnode.param1, param2=oldnode.param2}
-               callback(place_to_copy, newnode_copy, placer, oldnode_copy)
+               if callback(place_to_copy, newnode_copy, placer, oldnode_copy, itemstack) then
+                       take_item = false
+               end
        end
 
-       itemstack:take_item()
+       if take_item then
+               itemstack:take_item()
+       end
        return itemstack
 end
 
@@ -223,11 +231,20 @@ function minetest.item_place_object(itemstack, placer, pointed_thing)
 end
 
 function minetest.item_place(itemstack, placer, pointed_thing)
+       -- Call on_rightclick if the pointed node defines it
+       if pointed_thing.type == "node" and placer and
+                       not placer:get_player_control().sneak then
+               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)
+               end
+       end
+
        if itemstack:get_definition().type == "node" then
                return minetest.item_place_node(itemstack, placer, pointed_thing)
-       else
-               return minetest.item_place_object(itemstack, placer, pointed_thing)
        end
+       return itemstack
 end
 
 function minetest.item_drop(itemstack, dropper, pos)
@@ -244,7 +261,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)
@@ -273,7 +290,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
@@ -367,6 +392,7 @@ minetest.nodedef_default = {
        can_dig = nil,
 
        on_punch = redef_wrapper(minetest, 'node_punch'), -- minetest.node_punch
+       on_rightclick = nil,
        on_dig = redef_wrapper(minetest, 'node_dig'), -- minetest.node_dig
 
        on_receive_fields = nil,
@@ -456,7 +482,7 @@ minetest.noneitemdef_default = {  -- This is used for the hand and unknown items
        tool_capabilities = nil,
 
        -- Interaction callbacks
-       on_place = nil,
+       on_place = redef_wrapper(minetest, 'item_place'),
        on_drop = nil,
        on_use = nil,
 }