Fix minetest.item_eat's replace_with_item, fixes #2292

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

diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index 11a36bdc3e8653b0842315d5177910b92dcfd7c3..d25f4eff0ecf79fe39443d62303c68d2c3b2448c 100644 (file)
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -106,7 +106,7 @@ function core.facedir_to_dir(facedir)
                                        {x=0, y=1, z=0}})
 
                                        --indexed into by a table of correlating facedirs
-                                       [({[0]=1, 2, 3, 4, 
+                                       [({[0]=1, 2, 3, 4,
                                                5, 2, 6, 4,
                                                6, 2, 5, 4,
                                                1, 5, 3, 6,
@@ -238,7 +238,7 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2)
 
        core.log("action", placer:get_player_name() .. " places node "
                .. def.name .. " at " .. core.pos_to_string(place_to))
-       
+
        local oldnode = core.get_node(place_to)
        local newnode = {name = def.name, param1 = 0, param2 = param2}
 
@@ -335,35 +335,59 @@ function core.item_place(itemstack, placer, pointed_thing, param2)
 end
 
 function core.item_drop(itemstack, dropper, pos)
-       if dropper.get_player_name then
+       if dropper.is_player then
                local v = dropper:get_look_dir()
-               local p = {x=pos.x+v.x, y=pos.y+1.5+v.y, z=pos.z+v.z}
-               local obj = core.add_item(p, itemstack)
+               local p = {x=pos.x, y=pos.y+1.2, z=pos.z}
+               local cs = itemstack:get_count()
+               if dropper:get_player_control().sneak then
+                       cs = 1
+               end
+               local item = itemstack:take_item(cs)
+               local obj = core.add_item(p, item)
                if obj then
                        v.x = v.x*2
-                       v.y = v.y*2 + 1
+                       v.y = v.y*2 + 2
                        v.z = v.z*2
                        obj:setvelocity(v)
                end
+
        else
                core.add_item(pos, itemstack)
        end
-       return ItemStack("")
+       return itemstack
 end
 
-function core.item_eat(hp_change, replace_with_item)
-       return function(itemstack, user, pointed_thing)  -- closure
-               for _, callback in pairs(core.registered_on_item_eats) do
-                       local result = callback(hp_change, replace_with_item, itemstack, user, pointed_thing)
-                       if result then
-                               return result
-                       end
+function core.do_item_eat(hp_change, replace_with_item, itemstack, user, pointed_thing)
+       for _, callback in pairs(core.registered_on_item_eats) do
+               local result = callback(hp_change, replace_with_item, itemstack, user, pointed_thing)
+               if result then
+                       return result
                end
-               if itemstack:take_item() ~= nil then
-                       user:set_hp(user:get_hp() + hp_change)
-                       itemstack:add_item(replace_with_item) -- note: replace_with_item is optional
+       end
+       if itemstack:take_item() ~= nil then
+               user:set_hp(user:get_hp() + hp_change)
+
+               if replace_with_item then
+                       if itemstack:is_empty() then
+                               itemstack:add_item(replace_with_item)
+                       else
+                               local inv = user:get_inventory()
+                               if inv:room_for_item("main", {name=replace_with_item}) then
+                                       inv:add_item("main", replace_with_item)
+                               else
+                                       local pos = user:getpos()
+                                       pos.y = math.floor(pos.y + 0.5)
+                                       core.add_item(pos, replace_with_item)
+                               end
+                       end
                end
-               return itemstack
+       end
+       return itemstack
+end
+
+function core.item_eat(hp_change, replace_with_item)
+       return function(itemstack, user, pointed_thing)  -- closure
+               return core.do_item_eat(hp_change, replace_with_item, itemstack, user, pointed_thing)
        end
 end
 
@@ -419,7 +443,7 @@ function core.node_dig(pos, node, digger)
 
        local wielded = digger:get_wielded_item()
        local drops = core.get_node_drops(node.name, wielded:get_name())
-       
+
        local wdef = wielded:get_definition()
        local tp = wielded:get_tool_capabilities()
        local dp = core.get_dig_params(def.groups, tp)
@@ -432,7 +456,7 @@ function core.node_dig(pos, node, digger)
                end
        end
        digger:set_wielded_item(wielded)
-       
+
        -- Handle drops
        core.handle_node_drops(pos, drops, digger)
 
@@ -443,7 +467,7 @@ function core.node_dig(pos, node, digger)
 
        -- Remove node and update
        core.remove_node(pos)
-       
+
        -- Run callback
        if def.after_dig_node then
                -- Copy pos and node because callback can modify them
@@ -501,7 +525,7 @@ core.nodedef_default = {
        on_dig = redef_wrapper(core, 'node_dig'), -- core.node_dig
 
        on_receive_fields = nil,
-       
+
        on_metadata_inventory_move = core.node_metadata_inventory_move_allow_all,
        on_metadata_inventory_offer = core.node_metadata_inventory_offer_allow_all,
        on_metadata_inventory_take = core.node_metadata_inventory_take_allow_all,
@@ -592,4 +616,3 @@ core.noneitemdef_default = {  -- This is used for the hand and unknown items
        on_drop = nil,
        on_use = nil,
 }
-