Skip to content

Commit

Permalink
Merge branch 'preserve_immortal' of https://github.com/SmallJoker/min…
Browse files Browse the repository at this point in the history
  • Loading branch information
BuckarooBanzay authored and BuckarooBanzay committed Dec 17, 2019
2 parents e5b2cf3 + a05eae3 commit fccd4d8
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions 3d_armor/api.lua
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,11 @@ armor.set_player_armor = function(self, player)
if use_armor_monoid then
armor_monoid.monoid:add_change(player, change, "3d_armor:armor")
else
-- Preserve immortal group (damage disabled for player)
local immortal = player:get_armor_groups().immortal
if immortal and immortal ~= 0 then
groups.immortal = 1
end
player:set_armor_groups(groups)
end
if use_player_monoids then
Expand Down

0 comments on commit fccd4d8

Please sign in to comment.