Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma

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)

Subsurface/Source/Characters/Animation/Ragdoll.cs

@@ -984,7 +984,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;