diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs index 58a94d1723..41ee215fe2 100644 --- a/Content.Shared/Follower/FollowerSystem.cs +++ b/Content.Shared/Follower/FollowerSystem.cs @@ -162,8 +162,6 @@ public sealed class FollowerSystem : EntitySystem if (TryComp(follower, out var joints)) _jointSystem.ClearJoints(follower, joints); - _physicsSystem.SetLinearVelocity(follower, Vector2.Zero); - var xform = Transform(follower); _containerSystem.AttachParentToContainerOrGrid((follower, xform)); @@ -173,6 +171,8 @@ public sealed class FollowerSystem : EntitySystem _transform.SetCoordinates(follower, xform, new EntityCoordinates(entity, Vector2.Zero), rotation: Angle.Zero); } + _physicsSystem.SetLinearVelocity(follower, Vector2.Zero); + EnsureComp(follower); var followerEv = new StartedFollowingEntityEvent(entity, follower);