From fbd4a3a5160ff556e985182cce39b24c8082bfe6 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Sat, 2 Jan 2021 10:56:40 +0100 Subject: [PATCH] Fix burning sound keeping playing --- mods/ENTITIES/mcl_mobs/api.lua | 11 +++++++++-- mods/ITEMS/mcl_enchanting/enchantments.lua | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua index c8dc7143e2..b7a7091033 100644 --- a/mods/ENTITIES/mcl_mobs/api.lua +++ b/mods/ENTITIES/mcl_mobs/api.lua @@ -812,6 +812,7 @@ local check_for_death = function(self, cause, cmi_cause) if on_die_exit == true then self.state = "die" + mcl_burning.extinguish(self.object) self.object:remove() return true end @@ -874,6 +875,7 @@ local check_for_death = function(self, cause, cmi_cause) local dpos = self.object:get_pos() local cbox = self.collisionbox local yaw = self.object:get_rotation().y + mcl_burning.extinguish(self.object) self.object:remove() mobs.death_effect(dpos, yaw, cbox, not self.instant_death) end @@ -1022,6 +1024,7 @@ local do_env_damage = function(self) -- remove mob if beyond map limits if not within_limits(pos, 0) then + mcl_burning.extinguish(self.object) self.object:remove() return true 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) end end + mcl_burning.extinguish(self.object) self.object:remove() return true @@ -3162,6 +3166,7 @@ local mob_staticdata = function(self) and self.lifetimer <= 20 then 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() return ""-- nil @@ -3200,7 +3205,7 @@ local mob_activate = function(self, staticdata, def, dtime) -- remove monsters in peaceful mode if self.type == "monster" and minetest.settings:get_bool("only_peaceful_mobs", false) then - + mcl_burning.extinguish(self.object) self.object:remove() return @@ -3583,6 +3588,7 @@ local mob_step = function(self, dtime) else if math.random(1,10) <= 3 then minetest.log("action", "Mob "..self.name.." despawns in mob_step at "..minetest.pos_to_string(pos)) + mcl_burning.extinguish(self.object) self.object:remove() return end @@ -3590,6 +3596,7 @@ local mob_step = function(self, dtime) end else minetest.log("action", "Mob "..self.name.." despawns in mob_step at "..minetest.pos_to_string(pos)) + mcl_burning.extinguish(self.object) self.object:remove() return end @@ -4152,7 +4159,7 @@ function mobs:register_arrow(name, def) if self.switch == 0 or self.timer > 150 or not within_limits(pos, 0) then - + mcl_burning.extinguish(self.object) self.object:remove(); return diff --git a/mods/ITEMS/mcl_enchanting/enchantments.lua b/mods/ITEMS/mcl_enchanting/enchantments.lua index f9b8e0959f..d2803be146 100644 --- a/mods/ITEMS/mcl_enchanting/enchantments.lua +++ b/mods/ITEMS/mcl_enchanting/enchantments.lua @@ -172,7 +172,7 @@ mcl_enchanting.enchantments.feather_falling = { 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 = { name = S("Fire Aspect"), max_level = 2,