let the requested wielditem be the actual current wielditem and not just the initialized one

clean up some code to make a few lesser calls to it
This commit is contained in:
Tim 2015-02-04 13:01:55 +01:00
parent e53cd28fcb
commit efe2af2d20

View File

@ -90,7 +90,10 @@ local function wielder_on(data, wielder_pos, wielder_node)
setpos = delay(), setpos = delay(),
set_hp = delay(), set_hp = delay(),
set_properties = delay(), set_properties = delay(),
set_wielded_item = function(self, item) inv:set_stack(wield_inv_name, wieldindex, item) end, set_wielded_item = function(self, item)
wieldstack = item
inv:set_stack(wield_inv_name, wieldindex, item)
end,
set_animation = delay(), set_animation = delay(),
set_attach = delay(), set_attach = delay(),
set_detach = delay(), set_detach = delay(),
@ -317,13 +320,14 @@ if pipeworks.enable_node_breaker then
local oldwieldstack = ItemStack(wieldstack) local oldwieldstack = ItemStack(wieldstack)
local on_use = (minetest.registered_items[wieldstack:get_name()] or {}).on_use local on_use = (minetest.registered_items[wieldstack:get_name()] or {}).on_use
if on_use then if on_use then
virtplayer:set_wielded_item(on_use(wieldstack, virtplayer, pointed_thing) or wieldstack) wieldstack = on_use(wieldstack, virtplayer, pointed_thing) or wieldstack
virtplayer:set_wielded_item(wieldstack)
else else
local under_node = minetest.get_node(pointed_thing.under) local under_node = minetest.get_node(pointed_thing.under)
local on_dig = (minetest.registered_nodes[under_node.name] or {on_dig=minetest.node_dig}).on_dig local on_dig = (minetest.registered_nodes[under_node.name] or {on_dig=minetest.node_dig}).on_dig
on_dig(pointed_thing.under, under_node, virtplayer) on_dig(pointed_thing.under, under_node, virtplayer)
end
wieldstack = virtplayer:get_wielded_item() wieldstack = virtplayer:get_wielded_item()
end
local wieldname = wieldstack:get_name() local wieldname = wieldstack:get_name()
if wieldname == oldwieldstack:get_name() then if wieldname == oldwieldstack:get_name() then
-- don't mechanically wear out tool -- don't mechanically wear out tool