Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Correct issue where player/entities dies before effect is given

objects
Brandon 2020-07-20 19:48:58 -04:00
parent 43c4b355ce
commit 843f2d2a80
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mods/ITEMS/mcl_potions/functions.lua
View File

@ -457,16 +457,20 @@ function mcl_potions.healing_func(player, hp)
if obj and obj._cmi_is_mob then if obj and obj._cmi_is_mob then
obj.health = math.max(obj.health + hp, obj.hp_max) obj.health = math.max(obj.health + hp, obj.hp_max)
else elseif player:is_player()
player:set_hp(math.min(player:get_hp() + hp, player:get_properties().hp_max), { type = "set_hp", other = "healing" }) player:set_hp(math.min(player:get_hp() + hp, player:get_properties().hp_max), { type = "set_hp", other = "healing" })
else
return
end end
else else
if obj and obj._cmi_is_mob then if obj and obj._cmi_is_mob then
obj.health = obj.health + hp obj.health = obj.health + hp
else elseif player:is_player()
player:set_hp(player:get_hp() + hp, { type = "punch", other = "harming" }) player:set_hp(player:get_hp() + hp, { type = "punch", other = "harming" })
else
return
end end
end end