From a4ebb116c00156f7357a66fd8b5c2ac2b1d27669 Mon Sep 17 00:00:00 2001
From: juanjp600 <juanjprot@gmail.com>
Date: Thu, 17 Nov 2016 15:35:15 -0300
Subject: [PATCH] Fixed falling damage

---
 .../Source/Characters/Animation/HumanoidAnimController.cs       | 1 +
 Subsurface/Source/Characters/Animation/Ragdoll.cs               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs b/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
index 4da8aa2e3..b7c86fecc 100644
--- a/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
+++ b/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
@@ -61,6 +61,7 @@ namespace Barotrauma
 
             if (character.IsDead || character.IsUnconscious || stunTimer > 0.0f)
             {
+                levitatingCollider = false;
                 Collider.FarseerBody.FixedRotation = false;
 
                 /*if (character.IsRemotePlayer)
diff --git a/Subsurface/Source/Characters/Animation/Ragdoll.cs b/Subsurface/Source/Characters/Animation/Ragdoll.cs
index 2747c4fea..6cecf6b07 100644
--- a/Subsurface/Source/Characters/Animation/Ragdoll.cs
+++ b/Subsurface/Source/Characters/Animation/Ragdoll.cs
@@ -981,7 +981,7 @@ namespace Barotrauma
             rayEnd.Y -= Collider.height * 0.5f + Collider.radius + colliderHeightFromFloor*1.2f;
 
             Vector2 colliderBottomDisplay = ConvertUnits.ToDisplayUnits(GetColliderBottom());
-            if (!inWater && levitatingCollider)
+            if (!inWater && !character.IsDead && !character.IsUnconscious && levitatingCollider && Collider.LinearVelocity.Y>-ImpactTolerance)
             {
                 float closestFraction = 1.0f;
                 Fixture closestFixture = null;