From b2c71e92c075d38bf4d2ca0083601aba5ca33a23 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue, 2 Apr 2019 12:40:36 +0300
Subject: [PATCH] (f37be42bb) Fixed severed limbs occasionally noclipping into
 the submarine

---
 Barotrauma/BarotraumaShared/Source/Characters/Limb.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Limb.cs b/Barotrauma/BarotraumaShared/Source/Characters/Limb.cs
index b19684c74..32f020903 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Limb.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Limb.cs
@@ -472,12 +472,16 @@ namespace Barotrauma
             }
 
             if (isSevered)
-            {
+            {                
                 severedFadeOutTimer += deltaTime;
-                if (severedFadeOutTimer > SeveredFadeOutTime)
+                if (severedFadeOutTimer >= SeveredFadeOutTime)
                 {
                     body.Enabled = false;
                 }
+                else if (character.CurrentHull == null && Hull.FindHull(WorldPosition) != null)
+                {
+                    severedFadeOutTimer = SeveredFadeOutTime;
+                }
             }
 
             if (attack != null)