cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix docking fallback (#25854) 

Only thing that even triggers it atm is escape pods.

(cherry picked from commit bbb78807c43a9c22b08cf055339dbb74e8ab5d4c)
This commit is contained in:
metalgearsloth 2024-03-05 18:07:17 +11:00 committed by Debug
parent 132d02653c
commit c30ff6e5ea
No known key found for this signature in database
GPG Key ID: 271270A74EF9C350
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
View File

@ -448,16 +448,12 @@ public sealed partial class ShuttleSystem
!HasComp<MapComponent>(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
{