Merge branch 'preserve_immortal' of https://github.com/SmallJoker/minetest-3d_armor

PR: https://github.com/stujones11/minetest-3d_armor/pull/170
2019-12-17 14:36:05 +01:00 · 2019-12-17 14:36:05 +01:00 · fccd4d8b15
parent e5b2cf3a34 a05eae3782
commit fccd4d8b15
1 changed files with 5 additions and 0 deletions
--- a/3d_armor/api.lua
+++ b/3d_armor/api.lua
@ -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