From c30ff6e5eabbeecc7c06b2805bfe0afda1c07d65 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Tue, 5 Mar 2024 18:07:17 +1100 Subject: [PATCH] Fix docking fallback (#25854) Only thing that even triggers it atm is escape pods. (cherry picked from commit bbb78807c43a9c22b08cf055339dbb74e8ab5d4c) --- .../Shuttles/Systems/ShuttleSystem.FasterThanLight.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index 05bf7fc74d8..7b0c1b7484a 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -448,16 +448,12 @@ private void UpdateFTLArriving(Entity entity) !HasComp(target.EntityId)) { var config = _dockSystem.GetDockingConfigAt(uid, target.EntityId, target, entity.Comp1.TargetAngle); - MapCoordinates mapCoordinates; - Angle targetAngle; - mapCoordinates = _transform.ToMapCoordinates(target); + var mapCoordinates = _transform.ToMapCoordinates(target); // Couldn't dock somehow so just fallback to regular position FTL. if (config == null) { - targetAngle = entity.Comp1.TargetAngle; - target = new EntityCoordinates(_mapManager.GetMapEntityId(mapCoordinates.MapId), mapCoordinates.Position); - _transform.SetCoordinates(uid, xform, target, rotation: targetAngle); + TryFTLProximity(uid, target.EntityId); } else {