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

Content changes required for recursive deletion changes (#9316)

Browse Source
This commit is contained in:
Leon Friedrich
2022-07-08 06:30:02 +12:00
committed by GitHub
parent 6eba481657
commit dc38cc6074
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Shared/Follower/FollowerSystem.cs
View File

@@ -1,8 +1,9 @@
using Content.Shared.Database;
using Content.Shared.Database;
using Content.Shared.Follower.Components;
using Content.Shared.Ghost;
using Content.Shared.Movement.Events;
using Content.Shared.Verbs;
using Robust.Shared.Map;
namespace Content.Shared.Follower;
@@ -100,7 +101,13 @@ public sealed class FollowerSystem : EntitySystem
RemComp<FollowedComponent>(target);
RemComp<FollowerComponent>(uid);
Transform(uid).AttachToGridOrMap();
var xform = Transform(uid);
xform.AttachToGridOrMap();
if (xform.MapID == MapId.Nullspace)
{
Del(uid);
return;
}
RemComp<OrbitVisualsComponent>(uid);