Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Mixed 2 conditions into 1.

hardcore_mode_test
CyberMango 2023-01-06 01:13:39 +02:00
parent a1d98c080f
commit 06435e0f4c
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mods/HUD/mcl_death_messages/init.lua
View File

@ -231,18 +231,17 @@ mcl_damage.register_on_death(function(obj, reason)
end) end)
mcl_damage.register_on_damage(function(obj, damage, reason) mcl_damage.register_on_damage(function(obj, damage, reason)
if obj:get_hp() - damage > 0 then if (obj:get_hp() - damage > 0) and reason.source and
if reason.source and (reason.source:is_player() or obj:get_luaentity()) then (reason.source:is_player() or obj:get_luaentity()) then
-- To avoid timing issues we cancel the previous job before adding a new one. -- To avoid timing issues we cancel the previous job before adding a new one.
if mcl_death_messages.assist[obj] then if mcl_death_messages.assist[obj] then
mcl_death_messages.assist[obj].job:cancel() mcl_death_messages.assist[obj].job:cancel()
end
-- Add a new assist object with a timeout job.
local new_job = minetest.after(ASSIST_TIMEOUT_SEC, function()
mcl_death_messages.assist[obj] = nil
end)
mcl_death_messages.assist[obj] = {name = mcl_util.get_object_name(reason.source), job = new_job}
end end
-- Add a new assist object with a timeout job.
local new_job = minetest.after(ASSIST_TIMEOUT_SEC, function()
mcl_death_messages.assist[obj] = nil
end)
mcl_death_messages.assist[obj] = {name = mcl_util.get_object_name(reason.source), job = new_job}
end end
end) end)