Move item flight code

This commit is contained in:
Hybrid Dog 2017-09-07 20:57:02 +02:00
parent ce059ad5ad
commit 8c3a470690

@ -21,12 +21,40 @@ if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then
local ent = object:get_luaentity() local ent = object:get_luaentity()
if not ent if not ent
or ent.name ~= "__builtin:item" or ent.name ~= "__builtin:item"
or (ent.dropped_by and ent.age < pickup_age) then or (ent.dropped_by and ent.age < pickup_age)
or ent.itemstring == "" then
return return
end end
return ent return ent
end end
-- take item or reset velocity after flying a second
local function afterflight(object, inv, player)
local ent = opt_get_ent(object)
if not ent then
return
end
if inv
and inv:room_for_item("main",
ItemStack(ent.itemstring)
) then
inv:add_item("main",
ItemStack(ent.itemstring))
minetest.sound_play("item_drop_pickup", {
to_player = player:get_player_name(),
gain = pickup_gain,
})
ent.itemstring = ""
object:remove()
else
object:setvelocity({x=0,y=0,z=0})
ent.physical_state = true
ent.object:set_properties({
physical = true
})
end
end
local function pickupfunc() local function pickupfunc()
for _,player in ipairs(minetest.get_connected_players()) do for _,player in ipairs(minetest.get_connected_players()) do
local keys_pressed = not key_triggered local keys_pressed = not key_triggered
@ -92,34 +120,8 @@ if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then
physical = false physical = false
}) })
minetest.after(1, function() minetest.after(1.0, afterflight,
local lua = object:get_luaentity() object, inv, player)
if not lua or not lua.itemstring then
return
end
if inv:room_for_item("main",
ItemStack(object:get_luaentity(
).itemstring)
) then
inv:add_item("main",
ItemStack(object:get_luaentity(
).itemstring))
if object:get_luaentity().itemstring ~= "" then
minetest.sound_play("item_drop_pickup", {
to_player = player:get_player_name(),
gain = pickup_gain,
})
end
object:get_luaentity().itemstring = ""
object:remove()
else
object:setvelocity({x=0,y=0,z=0})
object:get_luaentity().physical_state = true
object:get_luaentity().object:set_properties({
physical = true
})
end
end, {player, object})
end end
end end
end end