tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix opposite force when throwing objects (#4398)

Browse Source 
* Fix opposite force when throwing objects

* DRY the throw impulse vector calculation
This commit is contained in:
Michael Cooke
2021-07-31 08:53:18 -04:00
committed by GitHub
parent c0c18b555b
commit 3cf08af9dd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Throwing/ThrowHelper.cs
View File

@@ -69,7 +69,9 @@ namespace Content.Server.Throwing
EntitySystem.Get<InteractionSystem>().ThrownInteraction(user, entity); EntitySystem.Get<InteractionSystem>().ThrownInteraction(user, entity);
} }
physicsComponent.ApplyLinearImpulse(direction.Normalized * strength * physicsComponent.Mass); var impulseVector = direction.Normalized * strength * physicsComponent.Mass;
physicsComponent.ApplyLinearImpulse(impulseVector);
// Estimate time to arrival so we can apply OnGround status and slow it much faster. // Estimate time to arrival so we can apply OnGround status and slow it much faster.
var time = (direction / strength).Length; var time = (direction / strength).Length;
@@ -96,7 +98,7 @@ namespace Content.Server.Throwing
if (!msg.Cancelled) if (!msg.Cancelled)
{ {
body.ApplyLinearImpulse(-direction * pushbackRatio); body.ApplyLinearImpulse(-impulseVector * pushbackRatio);
} }
} }
} }