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

Fix nearby warping (#9565)

Browse Source
This commit is contained in:
metalgearsloth
2022-07-09 15:20:23 +10:00
committed by GitHub
parent 18e7d80970
commit 53137cb527
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Shuttles/Systems/ShuttleSystem.Hyperspace.cs
View File

@@ -251,7 +251,8 @@ public sealed partial class ShuttleSystem
private bool TryHyperspaceDock(ShuttleComponent component, EntityUid targetUid) private bool TryHyperspaceDock(ShuttleComponent component, EntityUid targetUid)
{ {
if (!TryComp<TransformComponent>(component.Owner, out var xform) || if (!TryComp<TransformComponent>(component.Owner, out var xform) ||
!TryComp<TransformComponent>(targetUid, out var targetXform)) return false; !TryComp<TransformComponent>(targetUid, out var targetXform) ||
targetXform.MapUid == null) return false;
var config = GetDockingConfig(component, targetUid); var config = GetDockingConfig(component, targetUid);
@@ -291,7 +292,7 @@ public sealed partial class ShuttleSystem
shuttleBody.AngularVelocity = 0f; shuttleBody.AngularVelocity = 0f;
} }
xform.WorldPosition = spawnPos; xform.Coordinates = new EntityCoordinates(targetXform.MapUid.Value, spawnPos);
xform.WorldRotation = _random.NextAngle(); xform.WorldRotation = _random.NextAngle();
return false; return false;
} }