From 35a2a2b91288fa35ff97fe4e84897c429850fb9e Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Wed, 5 May 2021 13:27:30 +0200 Subject: [PATCH] Workaround to prevent double death messages --- mods/CORE/mcl_damage/init.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mods/CORE/mcl_damage/init.lua b/mods/CORE/mcl_damage/init.lua index c6f91d414..df2ecd58d 100644 --- a/mods/CORE/mcl_damage/init.lua +++ b/mods/CORE/mcl_damage/init.lua @@ -149,13 +149,18 @@ minetest.register_on_player_hpchange(function(player, hp_change, mt_reason) end, true) minetest.register_on_player_hpchange(function(player, hp_change, mt_reason) - if hp_change < 0 and player:get_hp() > 0 then + if hp_change < 0 then mcl_damage.run_damage_callbacks(player, -hp_change, mcl_damage.from_mt(mt_reason)) end + if player:get_hp() > 0 then + mt_reason._mcl_approved = true + end end, false) minetest.register_on_dieplayer(function(player, mt_reason) - mcl_damage.run_death_callbacks(player, mcl_damage.from_mt(mt_reason)) + if mt_reason._mcl_approved then + mcl_damage.run_death_callbacks(player, mcl_damage.from_mt(mt_reason)) + end end) minetest.register_on_mods_loaded(function()