From b1019a88ba9c0822d60d3f4a74d745c69be8a79b Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Tue, 12 Feb 2013 22:51:38 +0100 Subject: Fix to on_rightclick not able to change wielded_item --- builtin/item.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'builtin/item.lua') diff --git a/builtin/item.lua b/builtin/item.lua index a28798d4d..acbdaa533 100644 --- a/builtin/item.lua +++ b/builtin/item.lua @@ -237,8 +237,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 - 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) end end -- cgit v1.2.3 From 86b906d015ccde4e8f576a4e61d7c4ae8842b45d Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Wed, 13 Feb 2013 18:06:25 +0100 Subject: Fix minetest.item_place_node() and minetest.item_drop() to always return an ItemStack --- builtin/item.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'builtin/item.lua') diff --git a/builtin/item.lua b/builtin/item.lua index acbdaa533..2233b6c5b 100644 --- a/builtin/item.lua +++ b/builtin/item.lua @@ -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,7 +186,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 @@ -262,7 +262,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) -- cgit v1.2.3 From fc61c8809b9a1d47d9f117446764107a56cec956 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Tue, 19 Feb 2013 20:16:55 +0100 Subject: Dont drop tools on rightclick --- builtin/item.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'builtin/item.lua') diff --git a/builtin/item.lua b/builtin/item.lua index 2233b6c5b..69c4bd0bb 100644 --- a/builtin/item.lua +++ b/builtin/item.lua @@ -243,9 +243,8 @@ function minetest.item_place(itemstack, placer, pointed_thing) 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) -- cgit v1.2.3 From ef6b8bee07b9cefe7d463fabd199548d37ff2bee Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sat, 12 Jan 2013 20:18:43 +0100 Subject: Drop nodes as items when dugged and no room in inventory and dont remove dropped items when no room in inventory --- builtin/item.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'builtin/item.lua') diff --git a/builtin/item.lua b/builtin/item.lua index 69c4bd0bb..1349fdf63 100644 --- a/builtin/item.lua +++ b/builtin/item.lua @@ -290,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 -- cgit v1.2.3