pepebotella
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix items sometimes flying away after creation

This commit is contained in:
Wuzzy 2017-06-03 17:03:22 +02:00
parent fa3718f610
commit dcc6e3e829
1 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
mods/ENTITIES/mcl_item_entity/init.lua
View File

@ -1,7 +1,7 @@
--basic settings --basic settings
local item_drop_settings = {} --settings table local item_drop_settings = {} --settings table
item_drop_settings.age = 1 --how old a dropped item (_insta_collect==false) has to be before collecting item_drop_settings.age = 1.0 --how old a dropped item (_insta_collect==false) has to be before collecting
item_drop_settings.radius_magnet = 2 --radius of item magnet item_drop_settings.radius_magnet = 2.0 --radius of item magnet. MUST BE LARGER THAN radius_collect!
item_drop_settings.radius_collect = 0.2 --radius of collection item_drop_settings.radius_collect = 0.2 --radius of collection
item_drop_settings.player_collect_height = 1.0 --added to their pos y value item_drop_settings.player_collect_height = 1.0 --added to their pos y value
item_drop_settings.collection_safety = false --do this to prevent items from flying away on laggy servers item_drop_settings.collection_safety = false --do this to prevent items from flying away on laggy servers
@ -33,13 +33,18 @@ minetest.register_globalstep(function(dtime)
if player:get_hp() > 0 or not minetest.setting_getbool("enable_damage") then if player:get_hp() > 0 or not minetest.setting_getbool("enable_damage") then
local pos = player:getpos() local pos = player:getpos()
local inv = player:get_inventory() local inv = player:get_inventory()
local checkpos = {x=pos.x,y=pos.y + item_drop_settings.player_collect_height,z=pos.z}
--collection --magnet and collection
for _,object in ipairs(minetest.get_objects_inside_radius(checkpos, item_drop_settings.radius_magnet)) do
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" and (object:get_luaentity()._insta_collect or (object:get_luaentity().age > item_drop_settings.age)) then
object:get_luaentity()._magnet_timer = object:get_luaentity()._magnet_timer + dtime
if object:get_luaentity()._magnet_timer >= 0 and object:get_luaentity()._magnet_timer < item_drop_settings.magnet_time and inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
for _,object in ipairs(minetest.get_objects_inside_radius({x=pos.x,y=pos.y + item_drop_settings.player_collect_height,z=pos.z}, item_drop_settings.radius_collect)) do local collected = false
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
if object:get_luaentity()._insta_collect or (object:get_luaentity().age > item_drop_settings.age) then -- Collection
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then if vector.distance(checkpos, object:getpos()) <= item_drop_settings.radius_collect then
if object:get_luaentity().itemstring ~= "" then if object:get_luaentity().itemstring ~= "" then
inv:add_item("main", ItemStack(object:get_luaentity().itemstring)) inv:add_item("main", ItemStack(object:get_luaentity().itemstring))
@ -51,38 +56,24 @@ minetest.register_globalstep(function(dtime)
check_pickup_achievements(object, player) check_pickup_achievements(object, player)
object:get_luaentity().itemstring = "" object:get_luaentity().itemstring = ""
object:remove() object:remove()
collected = true
end end
-- Magnet
end else
end
end
end
--magnet
for _,object in ipairs(minetest.get_objects_inside_radius({x=pos.x,y=pos.y + item_drop_settings.player_collect_height,z=pos.z}, item_drop_settings.radius_magnet)) do
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" and (object:get_luaentity()._insta_collect or (object:get_luaentity().age > item_drop_settings.age)) then
object:get_luaentity()._magnet_timer = object:get_luaentity()._magnet_timer + dtime
if object:get_luaentity()._magnet_timer >= 0 and object:get_luaentity()._magnet_timer < item_drop_settings.magnet_time then
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
object:get_luaentity()._magnet_active = true object:get_luaentity()._magnet_active = true
object:get_luaentity()._collector_timer = 0 object:get_luaentity()._collector_timer = 0
--modified simplemobs api --modified simplemobs api
local pos1 = pos local pos1 = checkpos
local pos2 = object:getpos() local pos2 = object:getpos()
local vec = {x=pos1.x-pos2.x, y=(pos1.y+item_drop_settings.player_collect_height)-pos2.y, z=pos1.z-pos2.z} local vec = vector.subtract(pos1, pos2)
vec.x = pos2.x + (vec.x/3) vec = vector.add(pos2, vec)
vec.y = pos2.y + (vec.y/3)
vec.z = pos2.z + (vec.z/3)
object:moveto(vec) object:moveto(vec)
object:get_luaentity().physical_state = false object:get_luaentity().physical_state = false
object:get_luaentity().object:set_properties({ object:get_luaentity().object:set_properties({
physical = false physical = false
@ -134,10 +125,12 @@ minetest.register_globalstep(function(dtime)
end end
end end
if object:get_luaentity()._magnet_timer > 1 then if not collected then
object:get_luaentity()._magnet_timer = -item_drop_settings.magnet_time if object:get_luaentity()._magnet_timer > 1 then
elseif object:get_luaentity()._magnet_timer < 0 then object:get_luaentity()._magnet_timer = -item_drop_settings.magnet_time
object:get_luaentity()._magnet_timer = object:get_luaentity()._magnet_timer + dtime elseif object:get_luaentity()._magnet_timer < 0 then
object:get_luaentity()._magnet_timer = object:get_luaentity()._magnet_timer + dtime
end
end end
end end