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

Remove last component.Name calls (#13593)

Browse Source
This commit is contained in:
metalgearsloth
2023-01-19 13:57:18 +11:00
committed by GitHub
parent c6d3e4f3bd
commit 1b0e50ae19
11 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Construction/ConstructionSystem.Initial.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Server.Construction
{
public sealed partial class ConstructionSystem
{
[Dependency] private readonly IComponentFactory _factory = default!;
[Dependency] private readonly InventorySystem _inventorySystem = default!;
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
@@ -192,7 +192,7 @@ namespace Content.Server.Construction
case ArbitraryInsertConstructionGraphStep arbitraryStep:
foreach (var entity in EnumerateNearby(user))
{
if (!arbitraryStep.EntityValid(entity, EntityManager))
if (!arbitraryStep.EntityValid(entity, EntityManager, _factory))
continue;
if (string.IsNullOrEmpty(arbitraryStep.Store))
@@ -455,7 +455,7 @@ namespace Content.Server.Construction
switch (step)
{
case EntityInsertConstructionGraphStep entityInsert:
if (entityInsert.EntityValid(holding, EntityManager))
if (entityInsert.EntityValid(holding, EntityManager, _factory))
valid = true;
break;
case ToolConstructionGraphStep _:

2
Content.Server/Construction/ConstructionSystem.Interactions.cs
View File

@@ -285,7 +285,7 @@ namespace Content.Server.Construction
// Since many things inherit this step, we delegate the "is this entity valid?" logic to them.
// While this is very OOP and I find it icky, I must admit that it simplifies the code here a lot.
if(!insertStep.EntityValid(insert, EntityManager))
if(!insertStep.EntityValid(insert, EntityManager, _factory))
return HandleResult.False;
// If we're only testing whether this step would be handled by the given event, then we're done.