More safety checks

This commit is contained in:
teknomunk 2024-06-09 14:11:04 -05:00 committed by the-real-herowl
parent bc343769ee
commit a88951ac6a
1 changed files with 13 additions and 6 deletions

View File

@ -345,12 +345,19 @@ end -- END mcl_mobs.register_mob function
function mcl_mobs.register_conversion(old_name, new_name) function mcl_mobs.register_conversion(old_name, new_name)
minetest.register_entity(old_name, { minetest.register_entity(old_name, {
on_activate = function(self, staticdata, dtime) on_activate = function(self, staticdata, dtime)
local obj = minetest.add_entity(self.object:get_pos(), new_name, staticdata) local old_object = self.object
if obj then if not old_object then return end
local pos = old_object:get_pos()
old_object:remove() -- Always remove the object if we got this far
if not pos then return end
local new_object = minetest.add_entity(pos, new_name, staticdata)
if not new_object then return end
local hook = (obj:get_luaentity() or {})._on_after_convert local hook = (obj:get_luaentity() or {})._on_after_convert
if hook then hook(obj) end if hook then hook(obj) end
end
self.object:remove()
end, end,
_convert_to = new_name, _convert_to = new_name,
}) })