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

Fix MovespeedModifierMetabolism state handling (#15084)

Browse Source
This commit is contained in:
Leon Friedrich
2023-04-03 15:31:00 +12:00
committed by GitHub
parent 22db95faaa
commit 3dbd581382
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs
View File

@@ -20,11 +20,6 @@ namespace Content.Shared.Chemistry.Components
[ViewVariables] [ViewVariables]
public TimeSpan ModifierTimer { get; set; } = TimeSpan.Zero; public TimeSpan ModifierTimer { get; set; } = TimeSpan.Zero;
public override ComponentState GetComponentState()
{
return new MovespeedModifierMetabolismComponentState(WalkSpeedModifier, SprintSpeedModifier, ModifierTimer);
}
[Serializable, NetSerializable] [Serializable, NetSerializable]
public sealed class MovespeedModifierMetabolismComponentState : ComponentState public sealed class MovespeedModifierMetabolismComponentState : ComponentState
{ {

17
Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs
View File

@@ -22,26 +22,27 @@ namespace Content.Shared.Chemistry
UpdatesOutsidePrediction = true; UpdatesOutsidePrediction = true;
SubscribeLocalEvent<MovespeedModifierMetabolismComponent, ComponentHandleState>(OnMovespeedHandleState); SubscribeLocalEvent<MovespeedModifierMetabolismComponent, ComponentHandleState>(OnMovespeedHandleState);
SubscribeLocalEvent<MovespeedModifierMetabolismComponent, ComponentGetState>(OnGetState);
SubscribeLocalEvent<MovespeedModifierMetabolismComponent, ComponentStartup>(AddComponent); SubscribeLocalEvent<MovespeedModifierMetabolismComponent, ComponentStartup>(AddComponent);
SubscribeLocalEvent<MovespeedModifierMetabolismComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed); SubscribeLocalEvent<MovespeedModifierMetabolismComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
} }
private void OnGetState(EntityUid uid, MovespeedModifierMetabolismComponent component, ref ComponentGetState args)
{
args.State = new MovespeedModifierMetabolismComponentState(
component.WalkSpeedModifier,
component.SprintSpeedModifier,
component.ModifierTimer);
}
private void OnMovespeedHandleState(EntityUid uid, MovespeedModifierMetabolismComponent component, ref ComponentHandleState args) private void OnMovespeedHandleState(EntityUid uid, MovespeedModifierMetabolismComponent component, ref ComponentHandleState args)
{ {
if (args.Current is not MovespeedModifierMetabolismComponentState cast) if (args.Current is not MovespeedModifierMetabolismComponentState cast)
return; return;
if (EntityManager.TryGetComponent<MovementSpeedModifierComponent>(uid, out var modifier) &&
(!component.WalkSpeedModifier.Equals(cast.WalkSpeedModifier) ||
!component.SprintSpeedModifier.Equals(cast.SprintSpeedModifier)))
{
_movespeed.RefreshMovementSpeedModifiers(uid);
}
component.WalkSpeedModifier = cast.WalkSpeedModifier; component.WalkSpeedModifier = cast.WalkSpeedModifier;
component.SprintSpeedModifier = cast.SprintSpeedModifier; component.SprintSpeedModifier = cast.SprintSpeedModifier;
component.ModifierTimer = cast.ModifierTimer; component.ModifierTimer = cast.ModifierTimer;
} }
private void OnRefreshMovespeed(EntityUid uid, MovespeedModifierMetabolismComponent component, RefreshMovementSpeedModifiersEvent args) private void OnRefreshMovespeed(EntityUid uid, MovespeedModifierMetabolismComponent component, RefreshMovementSpeedModifiersEvent args)

7
Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
View File

@@ -2,11 +2,15 @@ using Content.Shared.Inventory;
using Content.Shared.Movement.Components; using Content.Shared.Movement.Components;
using Robust.Shared.GameStates; using Robust.Shared.GameStates;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace Content.Shared.Movement.Systems namespace Content.Shared.Movement.Systems
{ {
public sealed class MovementSpeedModifierSystem : EntitySystem public sealed class MovementSpeedModifierSystem : EntitySystem
{ {
[Dependency] private readonly IGameTiming _timing = default!;
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
@@ -39,6 +43,9 @@ namespace Content.Shared.Movement.Systems
if (!Resolve(uid, ref move, false)) if (!Resolve(uid, ref move, false))
return; return;
if (_timing.ApplyingState)
return;
var ev = new RefreshMovementSpeedModifiersEvent(); var ev = new RefreshMovementSpeedModifiersEvent();
RaiseLocalEvent(uid, ev); RaiseLocalEvent(uid, ev);