Mirrorlandia_minetest/item_drop
1
0
Fork 0
mirror of https://github.com/minetest-mods/item_drop.git synced 2024-12-22 22:02:26 +01:00
Code Issues Projects Releases Wiki Activity

Replace deprecated calls

Browse Source
This commit is contained in:
tacotexmex 2017-06-26 15:15:48 +02:00
parent a711c073ef
commit 2d42301d85
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
init.lua
View File

@ -1,11 +1,11 @@
minetest.register_globalstep(function(dtime) minetest.register_globalstep(function(dtime)
for _,player in ipairs(minetest.get_connected_players()) do for _,player in ipairs(minetest.get_connected_players()) do
if player:get_hp() > 0 or not minetest.setting_getbool("enable_damage") then if player:get_hp() > 0 or not minetest.settings:get_bool("enable_damage") then
local pos = player:getpos() local pos = player:getpos()
pos.y = pos.y+0.5 pos.y = pos.y+0.5
local inv = player:get_inventory() local inv = player:get_inventory()
for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 1)) do for _,object in ipairs(minetest.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 not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
inv:add_item("main", ItemStack(object:get_luaentity().itemstring)) inv:add_item("main", ItemStack(object:get_luaentity().itemstring))
@ -20,8 +20,8 @@ minetest.register_globalstep(function(dtime)
end end
end end
end end
for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 2)) do for _,object in ipairs(minetest.get_objects_inside_radius(pos, 2)) do
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
if object:get_luaentity().collect then if object:get_luaentity().collect then
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
@ -37,7 +37,7 @@ minetest.register_globalstep(function(dtime)
object:get_luaentity().object:set_properties({ object:get_luaentity().object:set_properties({
physical = false physical = false
}) })
minetest.after(1, function(args) minetest.after(1, function(args)
local lua = object:get_luaentity() local lua = object:get_luaentity()
if object == nil or lua == nil or lua.itemstring == nil then if object == nil or lua == nil or lua.itemstring == nil then
@ -61,7 +61,7 @@ minetest.register_globalstep(function(dtime)
}) })
end end
end, {player, object}) end, {player, object})
end end
end end
end end
@ -72,7 +72,7 @@ end)
function minetest.handle_node_drops(pos, drops, digger) function minetest.handle_node_drops(pos, drops, digger)
local inv local inv
if minetest.setting_getbool("creative_mode") and digger and digger:is_player() then if minetest.settings:get_bool("creative_mode") and digger and digger:is_player() then
inv = digger:get_inventory() inv = digger:get_inventory()
end end
for _,item in ipairs(drops) do for _,item in ipairs(drops) do
@ -86,7 +86,7 @@ function minetest.handle_node_drops(pos, drops, digger)
end end
if not inv or not inv:contains_item("main", ItemStack(name)) then if not inv or not inv:contains_item("main", ItemStack(name)) then
for i=1,count do for i=1,count do
local obj = minetest.env:add_item(pos, name) local obj = minetest.add_item(pos, name)
if obj ~= nil then if obj ~= nil then
obj:get_luaentity().collect = true obj:get_luaentity().collect = true
local x = math.random(1, 5) local x = math.random(1, 5)
@ -98,10 +98,10 @@ function minetest.handle_node_drops(pos, drops, digger)
z = -z z = -z
end end
obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z}) obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z})
-- FIXME this doesnt work for deactiveted objects -- FIXME this doesnt work for deactiveted objects
if minetest.setting_get("remove_items") and tonumber(minetest.setting_get("remove_items")) then if minetest.settings:get("remove_items") and tonumber(minetest.settings:get("remove_items")) then
minetest.after(tonumber(minetest.setting_get("remove_items")), function(obj) minetest.after(tonumber(minetest.settings:get("remove_items")), function(obj)
obj:remove() obj:remove()
end, obj) end, obj)
end end
@ -111,6 +111,6 @@ function minetest.handle_node_drops(pos, drops, digger)
end end
end end
if minetest.setting_get("log_mods") then if minetest.settings:get("log_mods") then
minetest.log("action", "item_drop loaded") minetest.log("action", "item_drop loaded")
end end