Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix more movement-rotation issues (#7016)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-07 20:05:44 +13:00
committed by GitHub
parent 4723c6bdda
commit c4ecb1678a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Movement/SharedMoverController.cs
View File

@@ -86,7 +86,9 @@ namespace Content.Shared.Movement
mover.LastGridAngle = parentRotation; mover.LastGridAngle = parentRotation;
if (worldTotal != Vector2.Zero) if (worldTotal != Vector2.Zero)
transform.WorldRotation = worldTotal.GetDir().ToAngle(); transform.LocalRotation = transform.GridID != GridId.Invalid
? total.ToWorldAngle()
: worldTotal.ToWorldAngle();
_physics.SetLinearVelocity(physicsComponent, worldTotal); _physics.SetLinearVelocity(physicsComponent, worldTotal);
} }
@@ -149,7 +151,9 @@ namespace Content.Shared.Movement
{ {
// This should have its event run during island solver soooo // This should have its event run during island solver soooo
xform.DeferUpdates = true; xform.DeferUpdates = true;
xform.LocalRotation = total.GetDir().ToAngle(); xform.LocalRotation = xform.GridID != GridId.Invalid
? total.ToWorldAngle()
: worldTotal.ToWorldAngle();
xform.DeferUpdates = false; xform.DeferUpdates = false;
HandleFootsteps(mover, mobMover); HandleFootsteps(mover, mobMover);
} }