Eliy21
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Merge pull request 'Fix double despawn in staticdata/activate (and resulting segfault)' (#2723) from fix_double_despawn into master 

Reviewed-on: MineClone2/MineClone2#2723
This commit is contained in:
cora 2022-10-06 17:38:40 +00:00
parent 8f5bca7506 d570a2dda6
commit 9107bfa62d
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mods/ENTITIES/mcl_mobs/api.lua
View File

@ -1459,7 +1459,7 @@ local breed = function(self)
z = 0 z = 0
}) })
end end
self.animation = nil self.animation = nil
local anim = self._current_animation local anim = self._current_animation
self._current_animation = nil -- Mobs Redo does nothing otherwise self._current_animation = nil -- Mobs Redo does nothing otherwise
@ -3408,10 +3408,8 @@ local mob_staticdata = function(self)
and ((not self.nametag) or (self.nametag == "")) and ((not self.nametag) or (self.nametag == ""))
and self.lifetimer <= 20 then and self.lifetimer <= 20 then
if spawn_logging then if spawn_logging then
minetest.log("action", "[mcl_mobs] Mob "..tostring(self.name).." despawns in mob_staticdata at "..minetest.pos_to_string(self.object:get_pos())) minetest.log("action", "[mcl_mobs] Mob "..tostring(self.name).." despawns in mob_staticdata at "..minetest.pos_to_string(vector.round(self.object:get_pos())))
end end
mcl_burning.extinguish(self.object)
self.object:remove()
return "remove"-- nil return "remove"-- nil
end end
@ -3441,21 +3439,19 @@ end
-- activate mob and reload settings -- activate mob and reload settings
local mob_activate = function(self, staticdata, def, dtime) local mob_activate = function(self, staticdata, def, dtime)
if not self.object:get_pos() or staticdata == "remove" then
mcl_burning.extinguish(self.object)
self.object:remove()
return
end
-- remove monsters in peaceful mode -- remove monsters in peaceful mode
if self.type == "monster" if self.type == "monster"
and minetest.settings:get_bool("only_peaceful_mobs", false) then and minetest.settings:get_bool("only_peaceful_mobs", false) then
mcl_burning.extinguish(self.object) mcl_burning.extinguish(self.object)
self.object:remove() self.object:remove()
return return
end end
if staticdata == "remove" then
mcl_burning.extinguish(self.object)
self.object:remove()
return
end
-- load entity variables -- load entity variables
local tmp = minetest.deserialize(staticdata) local tmp = minetest.deserialize(staticdata)
@ -4519,7 +4515,7 @@ function mcl_mobs:spawn_child(pos, mob_type)
ent.base_selbox[6] * .5, ent.base_selbox[6] * .5,
}, },
}) })
ent.animation = ent._child_animations ent.animation = ent._child_animations
ent._current_animation = nil ent._current_animation = nil
set_animation(ent, "stand") set_animation(ent, "stand")