From 9e97b4828f9929d18bcfece3b52e5e4cb78a8d4b Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Mon, 19 Nov 2018 20:24:11 +0200 Subject: [PATCH] Fixed oxygen-depleting status effects being able to kill characters that don't need oxygen --- Barotrauma/BarotraumaShared/Source/Characters/Character.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs index 8dc341e09..f2f536922 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs @@ -313,7 +313,7 @@ namespace Barotrauma get { return oxygen; } set { - if (!MathUtils.IsValid(value)) return; + if (!MathUtils.IsValid(value) || !needsAir) return; oxygen = MathHelper.Clamp(value, -100.0f, 100.0f); if (oxygen == -100.0f) Kill(AnimController.InWater ? CauseOfDeath.Drowning : CauseOfDeath.Suffocation); }