Fix third party mobs getting no damage from deal_damage

This commit is contained in:
parent 6b8226dae3
commit 6907f7cc4f
1 changed files with 8 additions and 18 deletions

View File

@ -545,28 +545,18 @@ function mcl_util.deal_damage(target, damage, mcl_reason)
if luaentity then
if luaentity.deal_damage then
luaentity:deal_damage(damage, mcl_reason or {type = "generic"})
return
elseif luaentity.is_mob then
-- local puncher = mcl_reason and mcl_reason.direct or target
-- target:punch(puncher, 1.0, {full_punch_interval = 1.0, damage_groups = {fleshy = damage}}, vector.direction(puncher:get_pos(), target:get_pos()), damage)
if luaentity.health > 0 then
luaentity.health = luaentity.health - damage
else
local puncher = mcl_reason and mcl_reason.direct or target
target:punch(puncher, 1.0, {full_punch_interval = 1.0, damage_groups = {fleshy = damage}}, vector.direction(puncher:get_pos(), target:get_pos()), damage)
end
return
end
end
local is_immortal = target:get_armor_groups().immortal or 0
if is_immortal>0 then
return
end
else -- Player
local hp = target:get_hp()
if hp > 0 then
target:set_hp(hp - damage, {_mcl_reason = mcl_reason})
end
end
end
function mcl_util.get_hp(obj)
local luaentity = obj:get_luaentity()