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

Inline TryGetComponent completely, for real

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:17:01 +01:00
parent 2ff4ec65d5
commit 69b270017b
425 changed files with 1143 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Alert/Click/StopPiloting.cs
View File

@@ -5,6 +5,7 @@ using Content.Shared.Shuttles;
using Content.Shared.Shuttles.Components;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.Alert.Click
@@ -18,7 +19,7 @@ namespace Content.Server.Alert.Click
{
public void AlertClicked(ClickAlertEventArgs args)
{
if (args.Player.TryGetComponent(out PilotComponent? pilotComponent) &&
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Player.Uid, out PilotComponent? pilotComponent) &&
pilotComponent.Console != null)
{
EntitySystem.Get<ShuttleConsoleSystem>().RemovePilot(pilotComponent);