Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

4
Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
View File

@@ -7,11 +7,11 @@ namespace Content.Shared.Construction.Steps
{
[DataField("component")] public string Component { get; } = string.Empty;
public override bool EntityValid(EntityUid uid, IEntityManager entityManager)
public override bool EntityValid(EntityUid uid, IEntityManager entityManager, IComponentFactory compFactory)
{
foreach (var component in entityManager.GetComponents(uid))
{
if (component.Name == Component)
if (compFactory.GetComponentName(component.GetType()) == Component)
return true;
}

2
Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs
View File

@@ -5,6 +5,6 @@
{
[DataField("store")] public string Store { get; } = string.Empty;
public abstract bool EntityValid(EntityUid uid, IEntityManager entityManager);
public abstract bool EntityValid(EntityUid uid, IEntityManager entityManager, IComponentFactory compFactory);
}
}

2
Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Shared.Construction.Steps
examinedEvent.Message.AddMarkup(Loc.GetString("construction-insert-material-entity", ("amount", Amount), ("materialName", material.Name)));
}
public override bool EntityValid(EntityUid uid, IEntityManager entityManager)
public override bool EntityValid(EntityUid uid, IEntityManager entityManager, IComponentFactory compFactory)
{
return entityManager.TryGetComponent(uid, out StackComponent? stack) && stack.StackTypeId == MaterialPrototypeId && stack.Count >= Amount;
}

2
Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs
View File

@@ -15,7 +15,7 @@ namespace Content.Shared.Construction.Steps
return list == null || list.Count == 0;
}
public override bool EntityValid(EntityUid uid, IEntityManager entityManager)
public override bool EntityValid(EntityUid uid, IEntityManager entityManager, IComponentFactory compFactory)
{
// This step can only happen if either list has tags.
if (IsNullOrEmpty(_allTags) && IsNullOrEmpty(_anyTags))

2
Content.Shared/Construction/Steps/TagConstructionGraphStep.cs
View File

@@ -8,7 +8,7 @@ namespace Content.Shared.Construction.Steps
[DataField("tag")]
private string? _tag;
public override bool EntityValid(EntityUid uid, IEntityManager entityManager)
public override bool EntityValid(EntityUid uid, IEntityManager entityManager, IComponentFactory compFactory)
{
var tagSystem = entityManager.EntitySysManager.GetEntitySystem<TagSystem>();
return !string.IsNullOrEmpty(_tag) && tagSystem.HasTag(uid, _tag);