tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make target ghost warps follow the entity (#6789)

Browse Source
This commit is contained in:
mirrorcult
2022-02-19 12:16:27 -07:00
committed by GitHub
parent e1dc6b0d43
commit a45d69e4e4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Ghost/GhostSystem.cs
View File

@@ -8,6 +8,7 @@ using Content.Server.Players;
using Content.Server.Visible; using Content.Server.Visible;
using Content.Server.Warps; using Content.Server.Warps;
using Content.Shared.Examine; using Content.Shared.Examine;
using Content.Shared.Follower;
using Content.Shared.Ghost; using Content.Shared.Ghost;
using Content.Shared.MobState.Components; using Content.Shared.MobState.Components;
using Content.Shared.Movement.EntitySystems; using Content.Shared.Movement.EntitySystems;
@@ -30,6 +31,7 @@ namespace Content.Server.Ghost
[Dependency] private readonly GameTicker _ticker = default!; [Dependency] private readonly GameTicker _ticker = default!;
[Dependency] private readonly MindSystem _mindSystem = default!; [Dependency] private readonly MindSystem _mindSystem = default!;
[Dependency] private readonly VisibilitySystem _visibilitySystem = default!; [Dependency] private readonly VisibilitySystem _visibilitySystem = default!;
[Dependency] private readonly FollowerSystem _followerSystem = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -158,6 +160,7 @@ namespace Content.Server.Ghost
if (FindLocation(msg.Name) is { } warp) if (FindLocation(msg.Name) is { } warp)
{ {
EntityManager.GetComponent<TransformComponent>(ghost.Owner).Coordinates = EntityManager.GetComponent<TransformComponent>(warp.Owner).Coordinates; EntityManager.GetComponent<TransformComponent>(ghost.Owner).Coordinates = EntityManager.GetComponent<TransformComponent>(warp.Owner).Coordinates;
return;
} }
Logger.Warning($"User {args.SenderSession.Name} tried to warp to an invalid warp: {msg.Name}"); Logger.Warning($"User {args.SenderSession.Name} tried to warp to an invalid warp: {msg.Name}");
@@ -178,7 +181,7 @@ namespace Content.Server.Ghost
return; return;
} }
EntityManager.GetComponent<TransformComponent>(ghost.Owner).Coordinates = EntityManager.GetComponent<TransformComponent>(msg.Target).Coordinates; _followerSystem.StartFollowingEntity(ghost.Owner, msg.Target);
} }
private void DeleteEntity(EntityUid uid) private void DeleteEntity(EntityUid uid)