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

Prevent follower recursion (#15921)

Browse Source
This commit is contained in:
Leon Friedrich
2023-04-30 13:44:14 +12:00
committed by GitHub
parent 818f23352e
commit b05343045f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,9 +65,15 @@ public sealed class FollowerSystem : EntitySystem
public void StartFollowingEntity(EntityUid follower, EntityUid entity) public void StartFollowingEntity(EntityUid follower, EntityUid entity)
{ {
// No recursion for you // No recursion for you
if (Transform(entity).ParentUid == follower) var targetXform = Transform(entity);
while (targetXform.ParentUid.IsValid())
{
if (targetXform.ParentUid == follower)
return; return;
targetXform = Transform(targetXform.ParentUid);
}
var followerComp = EnsureComp<FollowerComponent>(follower); var followerComp = EnsureComp<FollowerComponent>(follower);
followerComp.Following = entity; followerComp.Following = entity;