nalc/pipeworks
1
0
Fork 0
forked from mtcontrib/pipeworks
Code Issues Pull Requests Releases Wiki Activity

Fix crash when deleting luaentities with //clearobjects.

Browse Source
This commit is contained in:
Novatux 2015-08-01 16:36:50 +02:00
parent bedcf4d646
commit 4eeb6950c4
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default_settings.txt
View File

@ -18,3 +18,5 @@ pipeworks.enable_mese_sand_tube = true
pipeworks.enable_one_way_tube = true pipeworks.enable_one_way_tube = true
pipeworks.enable_priority_tube = true pipeworks.enable_priority_tube = true
pipeworks.enable_cyclic_mode = true pipeworks.enable_cyclic_mode = true
pipeworks.delete_item_on_clearobject = true

31
luaentity.lua
View File

@ -149,8 +149,8 @@ local entitydef_default = {
_remove_attached = function(self, index) _remove_attached = function(self, index)
local master = self._attached_entities_master local master = self._attached_entities_master
local entity = self._attached_entities[index] local entity = self._attached_entities[index]
local ent = entity.entity local ent = entity and entity.entity
entity.entity = nil if entity then entity.entity = nil end
if index == master then if index == master then
self:_detach_all() self:_detach_all()
local newmaster local newmaster
@ -315,10 +315,11 @@ minetest.register_globalstep(function(dtime)
end end
for id, entity in pairs(luaentity.entities) do for id, entity in pairs(luaentity.entities) do
local master = entity._attached_entities_master local master = entity._attached_entities_master
if master then local master_def = master and entity._attached_entities[master]
local master_def = entity._attached_entities[master] local master_entity = master_def and master_def.entity
local master_entity = master_def.entity local master_entity_pos = master_entity and master_entity:getpos()
entity._pos = vector.subtract(master_entity:getpos(), master_def.offset) if master_entity_pos then
entity._pos = vector.subtract(master_entity_pos, master_def.offset)
entity._velocity = master_entity:getvelocity() entity._velocity = master_entity:getvelocity()
entity._acceleration = master_entity:getacceleration() entity._acceleration = master_entity:getacceleration()
else else
@ -330,9 +331,21 @@ minetest.register_globalstep(function(dtime)
entity._velocity, entity._velocity,
vector.multiply(entity._acceleration, dtime)) vector.multiply(entity._acceleration, dtime))
end end
entity:_add_loaded() if master and not master_entity_pos then -- The entity has somehow been cleared
if entity.on_step then if pipeworks.delete_item_on_clearobject then
entity:on_step(dtime) entity:remove()
else
entity:_remove_attached(master)
entity:_add_loaded()
if entity.on_step then
entity:on_step(dtime)
end
end
else
entity:_add_loaded()
if entity.on_step then
entity:on_step(dtime)
end
end end
end end
end) end)