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

Remove 700 usages of Component.Owner (#21100)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-19 12:34:31 -07:00
committed by GitHub
parent 5825ffb95c
commit f560f88eb5
261 changed files with 2291 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Cargo/Systems/CargoSystem.Orders.cs
View File

@@ -1,14 +1,12 @@
using System.Diagnostics.CodeAnalysis;
using Content.Server.Cargo.Components;
using Content.Server.Labels.Components;
using Content.Server.Paper;
using Content.Shared.Cargo;
using Content.Shared.Cargo.BUI;
using Content.Shared.Cargo.Events;
using Content.Shared.Cargo.Prototypes;
using Content.Shared.Database;
using Content.Shared.GameTicking;
using Content.Server.Paper;
using Robust.Server.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.Players;
using Robust.Shared.Prototypes;
@@ -146,7 +144,8 @@ namespace Content.Server.Cargo.Systems
}
_idCardSystem.TryFindIdCard(player, out var idCard);
order.SetApproverData(idCard?.FullName, idCard?.JobTitle);
// ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
order.SetApproverData(idCard.Comp?.FullName, idCard.Comp?.JobTitle);
_audio.PlayPvs(_audio.GetSound(component.ConfirmSound), uid);
// Log order approval

5
Content.Server/Cargo/Systems/PricingSystem.cs
View File

@@ -13,6 +13,7 @@ using Content.Shared.Stacks;
using Robust.Shared.Console;
using Robust.Shared.Containers;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
@@ -57,7 +58,7 @@ public sealed class PricingSystem : EntitySystem
continue;
}
if (!_mapManager.TryGetGrid(gridId, out var mapGrid))
if (!TryComp(gridId, out MapGridComponent? mapGrid))
{
shell.WriteError($"Grid \"{gridId}\" doesn't exist.");
continue;
@@ -65,7 +66,7 @@ public sealed class PricingSystem : EntitySystem
List<(double, EntityUid)> mostValuable = new();
var value = AppraiseGrid(mapGrid.Owner, null, (uid, price) =>
var value = AppraiseGrid(gridId.Value, null, (uid, price) =>
{
mostValuable.Add((price, uid));
mostValuable.Sort((i1, i2) => i2.Item1.CompareTo(i1.Item1));