From 578a36b29da694e1c83a641d0d3d4671d10a39fe Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Tue, 16 Apr 2019 17:09:12 +0300 Subject: [PATCH] (4d9a797c5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev --- .../Source/Characters/Health/CharacterHealth.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs b/Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs index 25a281ca5..2bcb03cb3 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs @@ -587,7 +587,7 @@ namespace Barotrauma var affliction = GetAllAfflictions(a => a.Prefab.IndicatorLimb != LimbType.None) .OrderByDescending(a => a.DamagePerSecond) .ThenByDescending(a => a.Strength).FirstOrDefault(); - if (affliction.DamagePerSecond > 0 && affliction.Strength > 0) + if (affliction.DamagePerSecond > 0 || affliction.Strength > 0) { var limbHealth = GetMathingLimbHealth(affliction); if (limbHealth != null)