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

Fix docking config in some instances (#15005)

Browse Source
This commit is contained in:
metalgearsloth
2023-03-31 15:45:14 +11:00
committed by GitHub
parent ce34252cd3
commit 40deda74ab
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
View File

@@ -75,7 +75,7 @@ public sealed partial class DockingSystem
if (!ValidSpawn(grid, shuttleDockedAABB.Value)) if (!ValidSpawn(grid, shuttleDockedAABB.Value))
return false; return false;
gridRotation = targetGridRotation + gridDockAngle - shuttleDockAngle; gridRotation = (targetGridRotation + gridDockAngle - shuttleDockAngle).Reduced();
return true; return true;
} }
@@ -162,7 +162,7 @@ public sealed partial class DockingSystem
var spawnPosition = new EntityCoordinates(targetGrid, matty.Transform(Vector2.Zero)); var spawnPosition = new EntityCoordinates(targetGrid, matty.Transform(Vector2.Zero));
spawnPosition = new EntityCoordinates(targetGridXform.MapUid!.Value, spawnPosition.ToMapPos(EntityManager, _transform)); spawnPosition = new EntityCoordinates(targetGridXform.MapUid!.Value, spawnPosition.ToMapPos(EntityManager, _transform));
var dockedBounds = new Box2Rotated(shuttleAABB.Translated(spawnPosition.Position), targetGridAngle, spawnPosition.Position); var dockedBounds = new Box2Rotated(shuttleAABB.Translated(spawnPosition.Position), targetAngle, spawnPosition.Position);
// Check if there's no intersecting grids (AKA oh god it's docking at cargo). // Check if there's no intersecting grids (AKA oh god it's docking at cargo).
if (_mapManager.FindGridsIntersecting(targetGridXform.MapID, if (_mapManager.FindGridsIntersecting(targetGridXform.MapID,
@@ -180,8 +180,6 @@ public sealed partial class DockingSystem
(dockUid, gridDockUid, shuttleDock, gridDock), (dockUid, gridDockUid, shuttleDock, gridDock),
}; };
// TODO: Check shuttle orientation as the tiebreaker.
foreach (var (otherUid, other) in shuttleDocks) foreach (var (otherUid, other) in shuttleDocks)
{ {
if (other == shuttleDock) if (other == shuttleDock)