From 4c4bc39ae74c89f630126ead2030c0aff193966b Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sun, 12 Jun 2022 18:50:10 +1200 Subject: [PATCH] Fix cross grid movement (#8790) --- Content.Shared/Movement/SharedMoverController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Movement/SharedMoverController.cs b/Content.Shared/Movement/SharedMoverController.cs index 36423ae8c9..0dbadd5d95 100644 --- a/Content.Shared/Movement/SharedMoverController.cs +++ b/Content.Shared/Movement/SharedMoverController.cs @@ -90,11 +90,11 @@ namespace Content.Shared.Movement var worldTotal = _relativeMovement ? parentRotation.RotateVec(total) : total; - if (transform.GridEntityId == EntityUid.Invalid) + if (transform.GridEntityId != EntityUid.Invalid) mover.LastGridAngle = parentRotation; if (worldTotal != Vector2.Zero) - transform.LocalRotation = transform.GridEntityId == EntityUid.Invalid + transform.LocalRotation = transform.GridEntityId != EntityUid.Invalid ? total.ToWorldAngle() : worldTotal.ToWorldAngle();