sergiotarxz/Camas
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix crash when mob dies after environment dmg

Browse Source
This commit is contained in:
Wuzzy 2020-04-09 14:02:26 +02:00
parent ef2adaff66
commit 01f937045b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mods/mobs/api.lua
View File

@ -471,7 +471,7 @@ function mobs:register_mob(name, def)
if d > 5 then if d > 5 then
self.object:set_hp(self.object:get_hp() - math.floor(d - 5)) self.object:set_hp(self.object:get_hp() - math.floor(d - 5))
effect(self.object:get_pos(), 5, "tnt_smoke.png") effect(self.object:get_pos(), 5, "tnt_smoke.png")
if check_for_death(self) then return end if check_for_death(self) then return true end
end end
self.old_y = self.object:get_pos().y self.old_y = self.object:get_pos().y
end end
@ -501,6 +501,8 @@ function mobs:register_mob(name, def)
mob_sound(self, self.sounds.random) mob_sound(self, self.sounds.random)
end end
-- Environment damage handling
-- Returns true if mob died
local do_env_damage = function(self) local do_env_damage = function(self)
local pos = self.object:get_pos() local pos = self.object:get_pos()
@ -514,7 +516,7 @@ function mobs:register_mob(name, def)
and (minetest.get_node_light(pos) or 0) > 12 then and (minetest.get_node_light(pos) or 0) > 12 then
self.object:set_hp(self.object:get_hp() - self.light_damage) self.object:set_hp(self.object:get_hp() - self.light_damage)
effect(pos, 5, "tnt_smoke.png") effect(pos, 5, "tnt_smoke.png")
if check_for_death(self) then return end if check_for_death(self) then return true end
end end
pos.y = pos.y + self.collisionbox[2] -- foot level pos.y = pos.y + self.collisionbox[2] -- foot level
@ -532,7 +534,7 @@ function mobs:register_mob(name, def)
else else
effect(pos, self.blood_amount, "mobs_damage.png") effect(pos, self.blood_amount, "mobs_damage.png")
end end
if check_for_death(self) then return end if check_for_death(self) then return true end
end end
-- drowning damage -- drowning damage
@ -547,7 +549,7 @@ function mobs:register_mob(name, def)
self.object:set_hp(self.object:get_hp() - nodef.drowning) self.object:set_hp(self.object:get_hp() - nodef.drowning)
effect(pos, 5, "bubble.png") effect(pos, 5, "bubble.png")
end end
if check_for_death(self) then return end if check_for_death(self) then return true end
else else
self.breath = self.breath + 1 self.breath = self.breath + 1
if self.breath > self.breath_max then if self.breath > self.breath_max then
@ -561,7 +563,7 @@ function mobs:register_mob(name, def)
and nodef.groups.water then and nodef.groups.water then
self.object:set_hp(self.object:get_hp() - self.water_damage) self.object:set_hp(self.object:get_hp() - self.water_damage)
effect(pos, 5, "bubble.png") effect(pos, 5, "bubble.png")
if check_for_death(self) then return end if check_for_death(self) then return true end
end end
-- lava damage -- lava damage
@ -569,7 +571,7 @@ function mobs:register_mob(name, def)
and nodef.groups.lava then and nodef.groups.lava then
self.object:set_hp(self.object:get_hp() - self.lava_damage) self.object:set_hp(self.object:get_hp() - self.lava_damage)
effect(pos, 5, "mobs_flame.png", 8) effect(pos, 5, "mobs_flame.png", 8)
if check_for_death(self) then return end if check_for_death(self) then return true end
end end
end end
@ -626,9 +628,9 @@ function mobs:register_mob(name, def)
if self.state == "attack" if self.state == "attack"
and self.env_damage_timer > 1 then and self.env_damage_timer > 1 then
self.env_damage_timer = 0 self.env_damage_timer = 0
do_env_damage(self) if do_env_damage(self) then return end
elseif self.state ~= "attack" then elseif self.state ~= "attack" then
do_env_damage(self) if do_env_damage(self) then return end
end end
-- find someone to attack -- find someone to attack