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

Fixes crit in nograv (#2554)

Browse Source
This commit is contained in:
GlassEclipse
2020-11-21 21:40:09 -06:00
committed by GitHub
parent 8c81e7c767
commit 1f654df977
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
View File

@@ -49,7 +49,8 @@ namespace Content.Shared.GameObjects.EntitySystems
base.Shutdown(); base.Shutdown();
} }
protected void UpdateKinematics(ITransformComponent transform, IMoverComponent mover, IPhysicsComponent physics) //TODO: reorganize this to make more logical sense
protected void UpdateKinematics(ITransformComponent transform, IMoverComponent mover, IPhysicsComponent physics)
{ {
physics.EnsureController<MoverController>(); physics.EnsureController<MoverController>();
@@ -70,14 +71,14 @@ namespace Content.Shared.GameObjects.EntitySystems
// TODO: movement check. // TODO: movement check.
var (walkDir, sprintDir) = mover.VelocityDir; var (walkDir, sprintDir) = mover.VelocityDir;
var combined = walkDir + sprintDir; var combined = walkDir + sprintDir;
if (combined.LengthSquared < 0.001 || !ActionBlockerSystem.CanMove(mover.Owner) && !weightless) if (combined.LengthSquared < 0.001 || !ActionBlockerSystem.CanMove(mover.Owner) && !weightless)
{ {
if (physics.TryGetController(out MoverController controller)) if (physics.TryGetController(out MoverController controller))
{ {
controller.StopMoving(); controller.StopMoving();
} }
} }
else else if (ActionBlockerSystem.CanMove(mover.Owner))
{ {
if (weightless) if (weightless)
{ {