From 027882f38c6ccc6167f387968daf69eaa4335cbd Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sun, 5 Jan 2025 15:30:45 -0500 Subject: [PATCH] fix: server now reads request grid rather than location grid --- Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs index afa65ea7e2..0f3de26aae 100644 --- a/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs +++ b/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs @@ -21,7 +21,7 @@ private void NfInitialize() private void OnSetInertiaDampening(EntityUid uid, ShuttleConsoleComponent component, SetInertiaDampeningRequest args) { // Ensure that the entity requested is a valid shuttle (stations should not be togglable) - if (!EntityManager.TryGetComponent(uid, out TransformComponent? transform) || + if (!EntityManager.TryGetComponent(GetEntity(args.ShuttleEntityUid), out TransformComponent? transform) || !transform.GridUid.HasValue || !EntityManager.TryGetComponent(transform.GridUid, out PhysicsComponent? physicsComponent) || !EntityManager.TryGetComponent(transform.GridUid, out ShuttleComponent? shuttleComponent))