NO11
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Make item entities a bit more efficient" 

This reverts commit ba97dfd02f because it broke item entities.
This commit is contained in:
Wuzzy 2019-04-01 10:59:36 +02:00
parent 8533ff0b75
commit 2203d0df53
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,15 +88,6 @@ minetest.register_globalstep(function(dtime)
-- Magnet -- Magnet
else else
--move this to the front so players can see animation before collection
if not collected then
if object:get_luaentity()._magnet_timer > 1 then
object:get_luaentity()._magnet_timer = -item_drop_settings.magnet_time
object:get_luaentity()._magnet_active = false
elseif object:get_luaentity()._magnet_timer < 0 then
object:get_luaentity()._magnet_timer = object:get_luaentity()._magnet_timer + dtime
end
end
object:get_luaentity()._magnet_active = true object:get_luaentity()._magnet_active = true
object:get_luaentity()._collector_timer = 0 object:get_luaentity()._collector_timer = 0
@ -104,7 +95,11 @@ minetest.register_globalstep(function(dtime)
-- Move object to player -- Move object to player
disable_physics(object, object:get_luaentity()) disable_physics(object, object:get_luaentity())
object:move_to(checkpos) local opos = object:get_pos()
local vec = vector.subtract(checkpos, opos)
vec = vector.add(opos, vector.divide(vec, 2))
object:move_to(vec)
--fix eternally falling items --fix eternally falling items
minetest.after(0, function(object) minetest.after(0, function(object)
@ -148,6 +143,15 @@ minetest.register_globalstep(function(dtime)
end end
end end
if not collected then
if object:get_luaentity()._magnet_timer > 1 then
object:get_luaentity()._magnet_timer = -item_drop_settings.magnet_time
object:get_luaentity()._magnet_active = false
elseif object:get_luaentity()._magnet_timer < 0 then
object:get_luaentity()._magnet_timer = object:get_luaentity()._magnet_timer + dtime
end
end
end end
end end