fix (#572)

space-sunrise · Oct 30, 2024 · 946fa9a · 946fa9a
1 parent 4d99e87
commit 946fa9a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs
@@ -32,6 +32,7 @@ public sealed class FollowerSystem : EntitySystem
     [Dependency] private readonly INetManager _netMan = default!;
     [Dependency] private readonly ISharedAdminManager _adminManager = default!;
     [Dependency] private readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
 
     public override void Initialize()
     {
@@ -249,9 +250,10 @@ public void StopFollowingEntity(EntityUid uid, EntityUid target, FollowedCompone
             // Sunrise-Edit
             RemComp<BlockMovementComponent>(uid);
 
-            if (TryComp<FollowerComponent>(uid, out var followerComponent))
+            if (TryComp<FollowerComponent>(uid, out var followerComponent) && followerComponent.StopFollowActionEntity != null)
             {
                 _actions.RemoveAction(uid, followerComponent.StopFollowActionEntity);
+                _actionContainer.RemoveAction(followerComponent.StopFollowActionEntity.Value);
             }
             // Sunrise-Edit