tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ghosts following a moving entity causing them to be offset (#22783)

Browse Source 
Fixes #14220

Because the entity they start following is moving, the physics system gives the follower opposing velocity to counteract, at the time the parent change happens. This happens *after* the follower system tries to clear the follower's velocity, so the follower gets some velocity that will still move them a bit off-center.

Fix is easy enough, just reset velocity *after* reparenting, not before.
This commit is contained in:
Pieter-Jan Briers
2023-12-21 00:33:00 +01:00
committed by GitHub
parent 3f3669712f
commit 5e6f350731
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Follower/FollowerSystem.cs
View File

@@ -162,8 +162,6 @@ public sealed class FollowerSystem : EntitySystem
if (TryComp<JointComponent>(follower, out var joints)) if (TryComp<JointComponent>(follower, out var joints))
_jointSystem.ClearJoints(follower, joints); _jointSystem.ClearJoints(follower, joints);
_physicsSystem.SetLinearVelocity(follower, Vector2.Zero);
var xform = Transform(follower); var xform = Transform(follower);
_containerSystem.AttachParentToContainerOrGrid((follower, xform)); _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); _transform.SetCoordinates(follower, xform, new EntityCoordinates(entity, Vector2.Zero), rotation: Angle.Zero);
} }
_physicsSystem.SetLinearVelocity(follower, Vector2.Zero);
EnsureComp<OrbitVisualsComponent>(follower); EnsureComp<OrbitVisualsComponent>(follower);
var followerEv = new StartedFollowingEntityEvent(entity, follower); var followerEv = new StartedFollowingEntityEvent(entity, follower);