Merge branch 'indev' of git://github.com/RealBadAngel/technic into indev

This commit is contained in:
Vanessa Ezekowitz 2013-04-15 04:49:25 -04:00
commit 3e36899e11

View File

@ -8,7 +8,7 @@ minetest.register_globalstep(function(dtime)
for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 1)) do
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
if inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
if object:get_luaentity().timer > time_pick then
if object:get_luaentity() and object:get_luaentity().timer > time_pick then
inv:add_item("main", ItemStack(object:get_luaentity().itemstring))
if object:get_luaentity().itemstring ~= "" then
minetest.sound_play("item_drop_pickup", {
@ -137,4 +137,4 @@ minetest.register_on_dieplayer(function(name, pos)
end
end)
]]--
print("DROPS LOADED!")
print("DROPS LOADED!")