diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs index 1493ce4445..9547cca0ce 100644 --- a/Content.Shared/Follower/FollowerSystem.cs +++ b/Content.Shared/Follower/FollowerSystem.cs @@ -65,8 +65,14 @@ public sealed class FollowerSystem : EntitySystem public void StartFollowingEntity(EntityUid follower, EntityUid entity) { // No recursion for you - if (Transform(entity).ParentUid == follower) - return; + var targetXform = Transform(entity); + while (targetXform.ParentUid.IsValid()) + { + if (targetXform.ParentUid == follower) + return; + + targetXform = Transform(targetXform.ParentUid); + } var followerComp = EnsureComp(follower); followerComp.Following = entity;