Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix vehicle eye rotation (#11447)

Browse Source
This commit is contained in:
Leon Friedrich
2022-09-22 14:50:06 +12:00
committed by GitHub
parent 781f6e551e
commit c471aca2af
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Client/Vehicle/VehicleSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Client.Buckle.Strap; using Content.Client.Eye;
using Content.Shared.Vehicle; using Content.Shared.Vehicle;
using Content.Shared.Vehicle.Components; using Content.Shared.Vehicle.Components;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
@@ -12,6 +12,7 @@ namespace Content.Client.Vehicle
{ {
[Dependency] private readonly IEyeManager _eyeManager = default!; [Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly EyeLerpingSystem _lerpSys = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -24,8 +25,17 @@ namespace Content.Client.Vehicle
private void OnRiderShutdown(EntityUid uid, RiderComponent component, ComponentShutdown args) private void OnRiderShutdown(EntityUid uid, RiderComponent component, ComponentShutdown args)
{ {
if (component.Vehicle != null)
_lerpSys.RemoveEye(component.Vehicle.Value);
if (uid == _playerManager.LocalPlayer?.ControlledEntity
&& TryComp(uid, out EyeComponent? eye)
&& eye.Eye != null)
{
_eyeManager.CurrentEye = eye.Eye;
}
component.Vehicle = null; component.Vehicle = null;
UpdateEye(component);
} }
private void OnRiderAttached(EntityUid uid, RiderComponent component, PlayerAttachedEvent args) private void OnRiderAttached(EntityUid uid, RiderComponent component, PlayerAttachedEvent args)
@@ -35,18 +45,16 @@ namespace Content.Client.Vehicle
private void OnRiderDetached(EntityUid uid, RiderComponent component, PlayerDetachedEvent args) private void OnRiderDetached(EntityUid uid, RiderComponent component, PlayerDetachedEvent args)
{ {
UpdateEye(component); if (component.Vehicle != null)
_lerpSys.RemoveEye(component.Vehicle.Value);
} }
private void UpdateEye(RiderComponent component) private void UpdateEye(RiderComponent component)
{ {
if (!TryComp(component.Vehicle, out EyeComponent? eyeComponent)) if (!TryComp(component.Vehicle, out EyeComponent? eyeComponent) || eyeComponent.Eye == null)
{ return;
TryComp(_playerManager.LocalPlayer?.ControlledEntity, out eyeComponent);
}
if (eyeComponent?.Eye == null) return;
_lerpSys.AddEye(component.Vehicle.Value, eyeComponent);
_eyeManager.CurrentEye = eyeComponent.Eye; _eyeManager.CurrentEye = eyeComponent.Eye;
} }