Correct relay mover entity (#31040)

* Relay entity

* Server

diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
index 74a5e7afdcdff45727b0268b41da9aa0f4a4b155..03df383eebce1b0178c34f21cdca1506e24bc99c 100644 (file)
--- a/Content.Client/Physics/Controllers/MoverController.cs
+++ b/Content.Client/Physics/Controllers/MoverController.cs
@@ -60,7 +60,7 @@ namespace Content.Client.Physics.Controllers
             Physics.UpdateIsPredicted(entity.Owner);
             Physics.UpdateIsPredicted(entity.Comp.RelayEntity);
             if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
-                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
+                SetMoveInput((entity.Comp.RelayEntity, inputMover), MoveButtons.None);
         }
 
         private void OnRelayPlayerDetached(Entity<RelayInputMoverComponent> entity, ref LocalPlayerDetachedEvent args)
@@ -68,7 +68,7 @@ namespace Content.Client.Physics.Controllers
             Physics.UpdateIsPredicted(entity.Owner);
             Physics.UpdateIsPredicted(entity.Comp.RelayEntity);
             if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
-                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
+                SetMoveInput((entity.Comp.RelayEntity, inputMover), MoveButtons.None);
         }
 
         private void OnPlayerAttached(Entity<InputMoverComponent> entity, ref LocalPlayerAttachedEvent args)

diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index 8b6839ddd0e0314797f5c1132a78e5222ebc860d..19d58438b35b39fe5bd1ab4056613bea8439e74f 100644 (file)
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -33,13 +33,13 @@ namespace Content.Server.Physics.Controllers
         private void OnRelayPlayerAttached(Entity<RelayInputMoverComponent> entity, ref PlayerAttachedEvent args)
         {
             if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
-                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
+                SetMoveInput((entity.Comp.RelayEntity, inputMover), MoveButtons.None);
         }
 
         private void OnRelayPlayerDetached(Entity<RelayInputMoverComponent> entity, ref PlayerDetachedEvent args)
         {
             if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
-                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
+                SetMoveInput((entity.Comp.RelayEntity, inputMover), MoveButtons.None);
         }
 
         private void OnPlayerAttached(Entity<InputMoverComponent> entity, ref PlayerAttachedEvent args)