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

Correct relay mover entity (#31040)

Browse Source 
* Relay entity

* Server
This commit is contained in:
Plykiya
2024-08-15 05:30:53 -07:00
committed by GitHub
parent d752702092
commit af01d8fbff
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Physics/Controllers/MoverController.cs
View File

@@ -60,7 +60,7 @@ namespace Content.Client.Physics.Controllers
Physics.UpdateIsPredicted(entity.Owner); Physics.UpdateIsPredicted(entity.Owner);
Physics.UpdateIsPredicted(entity.Comp.RelayEntity); Physics.UpdateIsPredicted(entity.Comp.RelayEntity);
if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover)) 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) 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.Owner);
Physics.UpdateIsPredicted(entity.Comp.RelayEntity); Physics.UpdateIsPredicted(entity.Comp.RelayEntity);
if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover)) 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) private void OnPlayerAttached(Entity<InputMoverComponent> entity, ref LocalPlayerAttachedEvent args)

4
Content.Server/Physics/Controllers/MoverController.cs
View File

@@ -33,13 +33,13 @@ namespace Content.Server.Physics.Controllers
private void OnRelayPlayerAttached(Entity<RelayInputMoverComponent> entity, ref PlayerAttachedEvent args) private void OnRelayPlayerAttached(Entity<RelayInputMoverComponent> entity, ref PlayerAttachedEvent args)
{ {
if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover)) 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) private void OnRelayPlayerDetached(Entity<RelayInputMoverComponent> entity, ref PlayerDetachedEvent args)
{ {
if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover)) 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) private void OnPlayerAttached(Entity<InputMoverComponent> entity, ref PlayerAttachedEvent args)