From af01d8fbfff00bf28a93433c51458d9c369ff813 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Thu, 15 Aug 2024 05:30:53 -0700 Subject: [PATCH] Correct relay mover entity (#31040) * Relay entity * Server --- Content.Client/Physics/Controllers/MoverController.cs | 4 ++-- Content.Server/Physics/Controllers/MoverController.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs index 74a5e7afdc..03df383eeb 100644 --- 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 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 entity, ref LocalPlayerAttachedEvent args) diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs index 8b6839ddd0..19d58438b3 100644 --- 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 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 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 entity, ref PlayerAttachedEvent args)