From 648ffbf6737805568d87de37d34092dfa1b96429 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Fri, 25 Mar 2022 22:10:37 +0100
Subject: [PATCH] Fix resolve error when FollowedComponent is not found in
 StopFollowingEntity (#7276)

---
 Content.Shared/Follower/FollowerSystem.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs
index b6146be2af..2a33be5a83 100644
--- a/Content.Shared/Follower/FollowerSystem.cs
+++ b/Content.Shared/Follower/FollowerSystem.cs
@@ -1,12 +1,8 @@
 using Content.Shared.Database;
+using Content.Shared.Follower.Components;
 using Content.Shared.Ghost;
 using Content.Shared.Movement.EntitySystems;
 using Content.Shared.Verbs;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
-using Content.Shared.Follower.Components;
-using Robust.Shared.Maths;
-using Robust.Shared.Serialization;
 
 namespace Content.Shared.Follower;
 
@@ -92,7 +88,7 @@ public sealed class FollowerSystem : EntitySystem
     public void StopFollowingEntity(EntityUid uid, EntityUid target,
         FollowedComponent? followed=null)
     {
-        if (!Resolve(target, ref followed))
+        if (!Resolve(target, ref followed, false))
             return;
 
         if (!HasComp<FollowerComponent>(uid))