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

Remove some erroneous compadd subs (#19576)

Browse Source
This commit is contained in:
metalgearsloth
2023-08-27 16:08:29 +10:00
committed by GitHub
parent b311bf3741
commit d40f478fc6
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/Hands/Systems/HandsSystem.cs
View File

@@ -47,8 +47,8 @@ namespace Content.Client.Hands.Systems
SubscribeLocalEvent<HandsComponent, PlayerAttachedEvent>(HandlePlayerAttached); SubscribeLocalEvent<HandsComponent, PlayerAttachedEvent>(HandlePlayerAttached);
SubscribeLocalEvent<HandsComponent, PlayerDetachedEvent>(HandlePlayerDetached); SubscribeLocalEvent<HandsComponent, PlayerDetachedEvent>(HandlePlayerDetached);
SubscribeLocalEvent<HandsComponent, ComponentAdd>(HandleCompAdd); SubscribeLocalEvent<HandsComponent, ComponentStartup>(OnHandsStartup);
SubscribeLocalEvent<HandsComponent, ComponentRemove>(HandleCompRemove); SubscribeLocalEvent<HandsComponent, ComponentShutdown>(OnHandsShutdown);
SubscribeLocalEvent<HandsComponent, ComponentHandleState>(HandleComponentState); SubscribeLocalEvent<HandsComponent, ComponentHandleState>(HandleComponentState);
SubscribeLocalEvent<HandsComponent, VisualsChangedEvent>(OnVisualsChanged); SubscribeLocalEvent<HandsComponent, VisualsChangedEvent>(OnVisualsChanged);
@@ -399,13 +399,13 @@ namespace Content.Client.Hands.Systems
OnPlayerHandsRemoved?.Invoke(); OnPlayerHandsRemoved?.Invoke();
} }
private void HandleCompAdd(EntityUid uid, HandsComponent component, ComponentAdd args) private void OnHandsStartup(EntityUid uid, HandsComponent component, ComponentStartup args)
{ {
if (_playerManager.LocalPlayer?.ControlledEntity == uid) if (_playerManager.LocalPlayer?.ControlledEntity == uid)
OnPlayerHandsAdded?.Invoke(component); OnPlayerHandsAdded?.Invoke(component);
} }
private void HandleCompRemove(EntityUid uid, HandsComponent component, ComponentRemove args) private void OnHandsShutdown(EntityUid uid, HandsComponent component, ComponentShutdown args)
{ {
if (_playerManager.LocalPlayer?.ControlledEntity == uid) if (_playerManager.LocalPlayer?.ControlledEntity == uid)
OnPlayerHandsRemoved?.Invoke(); OnPlayerHandsRemoved?.Invoke();

9
Content.Server/Shuttles/Components/ShuttleComponent.cs
View File

@@ -29,7 +29,14 @@ namespace Content.Server.Shuttles.Components
/// <summary> /// <summary>
/// The thrusters contributing to each direction for impulse. /// The thrusters contributing to each direction for impulse.
/// </summary> /// </summary>
public readonly List<EntityUid>[] LinearThrusters = new List<EntityUid>[4]; // No touchy
public readonly List<EntityUid>[] LinearThrusters = new List<EntityUid>[]
{
new(),
new(),
new(),
new(),
};
/// <summary> /// <summary>
/// The thrusters contributing to the angular impulse of the shuttle. /// The thrusters contributing to the angular impulse of the shuttle.

10
Content.Server/Shuttles/Systems/ShuttleSystem.cs
View File

@@ -54,7 +54,6 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
InitializeIFF(); InitializeIFF();
InitializeImpact(); InitializeImpact();
SubscribeLocalEvent<ShuttleComponent, ComponentAdd>(OnShuttleAdd);
SubscribeLocalEvent<ShuttleComponent, ComponentStartup>(OnShuttleStartup); SubscribeLocalEvent<ShuttleComponent, ComponentStartup>(OnShuttleStartup);
SubscribeLocalEvent<ShuttleComponent, ComponentShutdown>(OnShuttleShutdown); SubscribeLocalEvent<ShuttleComponent, ComponentShutdown>(OnShuttleShutdown);
@@ -82,15 +81,6 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
CleanupHyperspace(); CleanupHyperspace();
} }
private void OnShuttleAdd(EntityUid uid, ShuttleComponent component, ComponentAdd args)
{
// Easier than doing it in the comp and they don't have constructors.
for (var i = 0; i < component.LinearThrusters.Length; i++)
{
component.LinearThrusters[i] = new List<EntityUid>();
}
}
private void OnGridFixtureChange(EntityUid uid, FixturesComponent manager, GridFixtureChangeEvent args) private void OnGridFixtureChange(EntityUid uid, FixturesComponent manager, GridFixtureChangeEvent args)
{ {
foreach (var fixture in args.NewFixtures) foreach (var fixture in args.NewFixtures)