mirror of
http://repo.or.cz/minetest_pyramids/tsm_pyramids.git
synced 2024-12-22 15:30:19 +01:00
Fix crash if mummy dies in fire
This commit is contained in:
parent
61ebaab55e
commit
3fc59c9010
17
mummy.lua
17
mummy.lua
@ -228,20 +228,21 @@ MUMMY_DEF.on_step = function(self, dtime)
|
|||||||
self.envdmg_timer = self.envdmg_timer + dtime
|
self.envdmg_timer = self.envdmg_timer + dtime
|
||||||
if dmg > 0 then
|
if dmg > 0 then
|
||||||
if self.envdmg_timer >= 1 then
|
if self.envdmg_timer >= 1 then
|
||||||
self.envdmg_timer = 0
|
local new_hp = self.object:get_hp() - dmg
|
||||||
self.object:set_hp(self.object:get_hp()-dmg)
|
if new_hp <= 0 then
|
||||||
self.last_damage = {
|
|
||||||
type = "environment",
|
|
||||||
pos = current_pos,
|
|
||||||
node = current_node,
|
|
||||||
}
|
|
||||||
if self.object:get_hp() <= 0 then
|
|
||||||
if self.on_death then
|
if self.on_death then
|
||||||
self.on_death(self)
|
self.on_death(self)
|
||||||
end
|
end
|
||||||
self.object:remove()
|
self.object:remove()
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
|
self.envdmg_timer = 0
|
||||||
|
self.object:set_hp(new_hp)
|
||||||
|
self.last_damage = {
|
||||||
|
type = "environment",
|
||||||
|
pos = current_pos,
|
||||||
|
node = current_node,
|
||||||
|
}
|
||||||
hit(self)
|
hit(self)
|
||||||
self.sound_timer = 0
|
self.sound_timer = 0
|
||||||
minetest.sound_play(sound_hit, {pos = current_pos, max_hear_distance = 10, gain = 0.4}, true)
|
minetest.sound_play(sound_hit, {pos = current_pos, max_hear_distance = 10, gain = 0.4}, true)
|
||||||
|
Loading…
Reference in New Issue
Block a user