Fixed falling damage

This commit is contained in:
juanjp600
2016-11-17 15:35:15 -03:00
parent a4f00310dc
commit a4ebb116c0
2 changed files with 2 additions and 1 deletions

View File

@@ -61,6 +61,7 @@ namespace Barotrauma
if (character.IsDead || character.IsUnconscious || stunTimer > 0.0f)
{
levitatingCollider = false;
Collider.FarseerBody.FixedRotation = false;
/*if (character.IsRemotePlayer)

View File

@@ -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;