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

Fix some friend access violations by allowing others access. (#8594)

Browse Source 
Rename Friend attribute to Access attribute.
Updates submodule to v0.21.0.0 as well.
This commit is contained in:
Vera Aguilera Puerto
2022-06-07 11:30:27 +02:00
committed by GitHub
parent 379555e933
commit c5f7c61041
162 changed files with 197 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,12 +25,12 @@ namespace Content.Shared.Construction.Steps
public override bool EntityValid(EntityUid uid, IEntityManager entityManager)
{
return entityManager.TryGetComponent(uid, out SharedStackComponent? stack) && stack.StackTypeId.Equals(MaterialPrototypeId) && stack.Count >= Amount;
return entityManager.TryGetComponent(uid, out SharedStackComponent? stack) && stack.StackTypeId == MaterialPrototypeId && stack.Count >= Amount;
}
public bool EntityValid(EntityUid entity, [NotNullWhen(true)] out SharedStackComponent? stack)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out SharedStackComponent? otherStack) && otherStack.StackTypeId.Equals(MaterialPrototypeId) && otherStack.Count >= Amount)
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out SharedStackComponent? otherStack) && otherStack.StackTypeId == MaterialPrototypeId && otherStack.Count >= Amount)
stack = otherStack;
else
stack = null;