diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs index 41ee215fe2..672f3d6487 100644 --- a/Content.Shared/Follower/FollowerSystem.cs +++ b/Content.Shared/Follower/FollowerSystem.cs @@ -4,6 +4,7 @@ using Content.Shared.Follower.Components; using Content.Shared.Ghost; using Content.Shared.Hands; using Content.Shared.Movement.Events; +using Content.Shared.Movement.Systems; using Content.Shared.Physics.Pull; using Content.Shared.Tag; using Content.Shared.Verbs; @@ -96,7 +97,8 @@ public sealed class FollowerSystem : EntitySystem private void OnFollowerMove(EntityUid uid, FollowerComponent component, ref MoveInputEvent args) { - StopFollowingEntity(uid, component.Following); + if ((args.Component.HeldMoveButtons & MoveButtons.AnyDirection) != MoveButtons.None) + StopFollowingEntity(uid, component.Following); } private void OnPullStarted(EntityUid uid, FollowerComponent component, PullStartedMessage args)