(f3bfe1ac4) Fix damage priority calculation.

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:10:25 +03:00
parent 9cc9137fff
commit cdeb6d40b3
12 changed files with 169 additions and 28 deletions
@@ -1152,6 +1152,10 @@ namespace Barotrauma
{
ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
}
if (!broken)
{
ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
}
ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
if (body == null || !body.Enabled || !inWater || ParentInventory != null || Removed) { return; }