(4d9a797c5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

This commit is contained in:
Joonas Rikkonen
2019-04-16 17:09:12 +03:00
parent f667455659
commit 578a36b29d
@@ -587,7 +587,7 @@ namespace Barotrauma
var affliction = GetAllAfflictions(a => a.Prefab.IndicatorLimb != LimbType.None) var affliction = GetAllAfflictions(a => a.Prefab.IndicatorLimb != LimbType.None)
.OrderByDescending(a => a.DamagePerSecond) .OrderByDescending(a => a.DamagePerSecond)
.ThenByDescending(a => a.Strength).FirstOrDefault(); .ThenByDescending(a => a.Strength).FirstOrDefault();
if (affliction.DamagePerSecond > 0 && affliction.Strength > 0) if (affliction.DamagePerSecond > 0 || affliction.Strength > 0)
{ {
var limbHealth = GetMathingLimbHealth(affliction); var limbHealth = GetMathingLimbHealth(affliction);
if (limbHealth != null) if (limbHealth != null)