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

Fix FTL docks not opening (#25808)

Browse Source
This commit is contained in:
metalgearsloth
2024-03-04 02:00:52 +11:00
committed by GitHub
parent b7ccf73888
commit 21a95960f0
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Shuttles/Systems/ArrivalsSystem.cs
View File

@@ -417,13 +417,6 @@ public sealed class ArrivalsSystem : EntitySystem
var curTime = _timing.CurTime; var curTime = _timing.CurTime;
TryGetArrivals(out var arrivals); TryGetArrivals(out var arrivals);
// TODO: FTL fucker, if on an edge tile every N seconds check for wall or w/e
// TODO: Docking should be per-grid rather than per dock and bump off when undocking.
// TODO: Stop dispatch if emergency shuttle has arrived.
// TODO: Need maps
// TODO: Need emergency suits on shuttle probs
// TODO: Need some kind of comp to shunt people off if they try to get on?
if (TryComp<TransformComponent>(arrivals, out var arrivalsXform)) if (TryComp<TransformComponent>(arrivals, out var arrivalsXform))
{ {
while (query.MoveNext(out var uid, out var comp, out var shuttle, out var xform)) while (query.MoveNext(out var uid, out var comp, out var shuttle, out var xform))

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

@@ -447,21 +447,20 @@ public sealed partial class ShuttleSystem
var config = _dockSystem.GetDockingConfigAt(uid, target.EntityId, target, entity.Comp1.TargetAngle); var config = _dockSystem.GetDockingConfigAt(uid, target.EntityId, target, entity.Comp1.TargetAngle);
MapCoordinates mapCoordinates; MapCoordinates mapCoordinates;
Angle targetAngle; Angle targetAngle;
mapCoordinates = _transform.ToMapCoordinates(target);
// Couldn't dock somehow so just fallback to regular position FTL. // Couldn't dock somehow so just fallback to regular position FTL.
if (config == null) if (config == null)
{ {
mapCoordinates = _transform.ToMapCoordinates(target);
targetAngle = entity.Comp1.TargetAngle; targetAngle = entity.Comp1.TargetAngle;
target = new EntityCoordinates(_mapManager.GetMapEntityId(mapCoordinates.MapId), mapCoordinates.Position);
_transform.SetCoordinates(uid, xform, target, rotation: targetAngle);
} }
else else
{ {
mapCoordinates = _transform.ToMapCoordinates(config.Coordinates); FTLDock((uid, xform), config);
targetAngle = config.Angle;
} }
target = new EntityCoordinates(_mapManager.GetMapEntityId(mapCoordinates.MapId), mapCoordinates.Position);
_transform.SetCoordinates(uid, xform, target, rotation: targetAngle);
mapId = mapCoordinates.MapId; mapId = mapCoordinates.MapId;
} }
// Position ftl // Position ftl