Impulse
/
MineClone2
forked from VoxeLibre/VoxeLibre
0
0
Fork 0
Code Pull Requests Activity

Fix burning sound keeping playing

This commit is contained in:
Lizzy Fleckenstein 2021-01-02 10:56:40 +01:00
parent 212e895c1a
commit fbd4a3a516
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -812,6 +812,7 @@ local check_for_death = function(self, cause, cmi_cause)
if on_die_exit == true then if on_die_exit == true then
self.state = "die" self.state = "die"
mcl_burning.extinguish(self.object)
self.object:remove() self.object:remove()
return true return true
end end
@ -874,6 +875,7 @@ local check_for_death = function(self, cause, cmi_cause)
local dpos = self.object:get_pos() local dpos = self.object:get_pos()
local cbox = self.collisionbox local cbox = self.collisionbox
local yaw = self.object:get_rotation().y local yaw = self.object:get_rotation().y
mcl_burning.extinguish(self.object)
self.object:remove() self.object:remove()
mobs.death_effect(dpos, yaw, cbox, not self.instant_death) mobs.death_effect(dpos, yaw, cbox, not self.instant_death)
end end
@ -1022,6 +1024,7 @@ local do_env_damage = function(self)
-- remove mob if beyond map limits -- remove mob if beyond map limits
if not within_limits(pos, 0) then if not within_limits(pos, 0) then
mcl_burning.extinguish(self.object)
self.object:remove() self.object:remove()
return true return true
end end
@ -2544,6 +2547,7 @@ local do_states = function(self, dtime)
effect(pos, 32, "mcl_particles_smoke.png", nil, nil, node_break_radius, 1, 0) effect(pos, 32, "mcl_particles_smoke.png", nil, nil, node_break_radius, 1, 0)
end end
end end
mcl_burning.extinguish(self.object)
self.object:remove() self.object:remove()
return true return true
@ -3162,6 +3166,7 @@ local mob_staticdata = function(self)
and self.lifetimer <= 20 then and self.lifetimer <= 20 then
minetest.log("action", "Mob "..name.." despawns in mob_staticdata at "..minetest.pos_to_string(self.object.get_pos())) minetest.log("action", "Mob "..name.." despawns in mob_staticdata at "..minetest.pos_to_string(self.object.get_pos()))
mcl_burning.extinguish(self.object)
self.object:remove() self.object:remove()
return ""-- nil return ""-- nil
@ -3200,7 +3205,7 @@ local mob_activate = function(self, staticdata, def, dtime)
-- 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)
self.object:remove() self.object:remove()
return return
@ -3583,6 +3588,7 @@ local mob_step = function(self, dtime)
else else
if math.random(1,10) <= 3 then if math.random(1,10) <= 3 then
minetest.log("action", "Mob "..self.name.." despawns in mob_step at "..minetest.pos_to_string(pos)) minetest.log("action", "Mob "..self.name.." despawns in mob_step at "..minetest.pos_to_string(pos))
mcl_burning.extinguish(self.object)
self.object:remove() self.object:remove()
return return
end end
@ -3590,6 +3596,7 @@ local mob_step = function(self, dtime)
end end
else else
minetest.log("action", "Mob "..self.name.." despawns in mob_step at "..minetest.pos_to_string(pos)) minetest.log("action", "Mob "..self.name.." despawns in mob_step at "..minetest.pos_to_string(pos))
mcl_burning.extinguish(self.object)
self.object:remove() self.object:remove()
return return
end end
@ -4152,7 +4159,7 @@ function mobs:register_arrow(name, def)
if self.switch == 0 if self.switch == 0
or self.timer > 150 or self.timer > 150
or not within_limits(pos, 0) then or not within_limits(pos, 0) then
mcl_burning.extinguish(self.object)
self.object:remove(); self.object:remove();
return return

2
mods/ITEMS/mcl_enchanting/enchantments.lua
View File

@ -172,7 +172,7 @@ mcl_enchanting.enchantments.feather_falling = {
power_range_table = {{5, 11}, {11, 17}, {17, 23}, {23, 29}}, power_range_table = {{5, 11}, {11, 17}, {17, 23}, {23, 29}},
} }
-- implemented via register_on_punchplayer callback -- implemented in mcl_mobs and via register_on_punchplayer callback
mcl_enchanting.enchantments.fire_aspect = { mcl_enchanting.enchantments.fire_aspect = {
name = S("Fire Aspect"), name = S("Fire Aspect"),
max_level = 2, max_level = 2,