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

Clean up all missing EntitySystem proxy method uses (#38353)

Browse Source
This commit is contained in:
Tayrtahn
2025-06-26 19:50:49 -04:00
committed by GitHub
parent 73df3b1593
commit 75db49f9c0
185 changed files with 418 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Shared/Alert/AlertsSystem.cs
View File

@@ -15,7 +15,7 @@ public abstract class AlertsSystem : EntitySystem
public IReadOnlyDictionary<AlertKey, AlertState>? GetActiveAlerts(EntityUid euid)
{
return EntityManager.TryGetComponent(euid, out AlertsComponent? comp)
return TryComp(euid, out AlertsComponent? comp)
? comp.Alerts
: null;
}
@@ -38,7 +38,7 @@ public abstract class AlertsSystem : EntitySystem
public bool IsShowingAlert(EntityUid euid, ProtoId<AlertPrototype> alertType)
{
if (!EntityManager.TryGetComponent(euid, out AlertsComponent? alertsComponent))
if (!TryComp(euid, out AlertsComponent? alertsComponent))
return false;
if (TryGet(alertType, out var alert))
@@ -53,13 +53,13 @@ public abstract class AlertsSystem : EntitySystem
/// <returns>true iff an alert of the indicated alert category is currently showing</returns>
public bool IsShowingAlertCategory(EntityUid euid, ProtoId<AlertCategoryPrototype> alertCategory)
{
return EntityManager.TryGetComponent(euid, out AlertsComponent? alertsComponent)
return TryComp(euid, out AlertsComponent? alertsComponent)
&& alertsComponent.Alerts.ContainsKey(AlertKey.ForCategory(alertCategory));
}
public bool TryGetAlertState(EntityUid euid, AlertKey key, out AlertState alertState)
{
if (EntityManager.TryGetComponent(euid, out AlertsComponent? alertsComponent))
if (TryComp(euid, out AlertsComponent? alertsComponent))
return alertsComponent.Alerts.TryGetValue(key, out alertState);
alertState = default;
@@ -155,7 +155,7 @@ public abstract class AlertsSystem : EntitySystem
if (_timing.ApplyingState)
return;
if (!EntityManager.TryGetComponent(euid, out AlertsComponent? alertsComponent))
if (!TryComp(euid, out AlertsComponent? alertsComponent))
return;
if (TryGet(alertType, out var alert))
@@ -311,14 +311,14 @@ public abstract class AlertsSystem : EntitySystem
private void HandleClickAlert(ClickAlertEvent msg, EntitySessionEventArgs args)
{
var player = args.SenderSession.AttachedEntity;
if (player is null || !EntityManager.HasComponent<AlertsComponent>(player))
if (player is null || !HasComp<AlertsComponent>(player))
return;
if (!IsShowingAlert(player.Value, msg.Type))
{
Log.Debug("User {0} attempted to" +
" click alert {1} which is not currently showing for them",
EntityManager.GetComponent<MetaDataComponent>(player.Value).EntityName, msg.Type);
Comp<MetaDataComponent>(player.Value).EntityName, msg.Type);
return;
}