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

Update trivial components to use auto comp states (#20539)

Browse Source
This commit is contained in:
DrSmugleaf
2023-09-28 16:20:29 -07:00
committed by GitHub
parent 14cfe44ece
commit a44fa86b68
158 changed files with 806 additions and 2866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Shared/Movement/Systems/SharedJetpackSystem.cs
View File

@@ -5,7 +5,6 @@ using Content.Shared.Movement.Components;
using Content.Shared.Movement.Events;
using Content.Shared.Popups;
using Robust.Shared.Containers;
using Robust.Shared.GameStates;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Systems;
using Robust.Shared.Serialization;
@@ -31,8 +30,6 @@ public abstract class SharedJetpackSystem : EntitySystem
SubscribeLocalEvent<JetpackUserComponent, CanWeightlessMoveEvent>(OnJetpackUserCanWeightless);
SubscribeLocalEvent<JetpackUserComponent, EntParentChangedMessage>(OnJetpackUserEntParentChanged);
SubscribeLocalEvent<JetpackUserComponent, ComponentGetState>(OnJetpackUserGetState);
SubscribeLocalEvent<JetpackUserComponent, ComponentHandleState>(OnJetpackUserHandleState);
SubscribeLocalEvent<GravityChangedEvent>(OnJetpackUserGravityChanged);
}
@@ -60,22 +57,6 @@ public abstract class SharedJetpackSystem : EntitySystem
}
}
private void OnJetpackUserHandleState(EntityUid uid, JetpackUserComponent component, ref ComponentHandleState args)
{
if (args.Current is not JetpackUserComponentState state)
return;
component.Jetpack = EnsureEntity<JetpackUserComponent>(state.Jetpack, uid);
}
private void OnJetpackUserGetState(EntityUid uid, JetpackUserComponent component, ref ComponentGetState args)
{
args.State = new JetpackUserComponentState()
{
Jetpack = GetNetEntity(component.Jetpack),
};
}
private void OnJetpackDropped(EntityUid uid, JetpackComponent component, DroppedEvent args)
{
SetEnabled(uid, component, false, args.User);
@@ -204,12 +185,6 @@ public abstract class SharedJetpackSystem : EntitySystem
{
return true;
}
[Serializable, NetSerializable]
protected sealed class JetpackUserComponentState : ComponentState
{
public NetEntity Jetpack;
}
}
[Serializable, NetSerializable]