From ee5c83b10b2718baaca0989f81a2bc0d11e1c599 Mon Sep 17 00:00:00 2001
From: lunarica <splatt.pr@gmail.com>
Date: Wed, 23 Oct 2024 00:24:08 +0500
Subject: [PATCH] fix-followed-del

---
 Content.Shared/Follower/FollowerSystem.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs
index 5424abb3b13..42f611913a2 100644
--- a/Content.Shared/Follower/FollowerSystem.cs
+++ b/Content.Shared/Follower/FollowerSystem.cs
@@ -246,6 +246,15 @@ public void StopFollowingEntity(EntityUid uid, EntityUid target, FollowedCompone
 
         if (removeComp)
         {
+            // Sunrise-Edit
+            RemComp<BlockMovementComponent>(uid);
+
+            if (TryComp<FollowerComponent>(uid, out var followerComponent))
+            {
+                _actions.RemoveAction(uid, followerComponent.StopFollowActionEntity);
+            }
+            // Sunrise-Edit
+
             RemComp<FollowerComponent>(uid);
             RemComp<OrbitVisualsComponent>(uid);
         }