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

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

Browse Source
This commit is contained in:
Pieter-Jan Briers
2022-06-07 13:44:31 +02:00
committed by GitHub
parent c5f7c61041
commit cecf87997b
162 changed files with 169 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Construction/Components/AnchorableComponent.cs
View File

@@ -5,7 +5,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
namespace Content.Shared.Construction.Components
{
[RegisterComponent, Access(typeof(SharedAnchorableSystem))]
[RegisterComponent, Friend(typeof(SharedAnchorableSystem))]
public sealed class AnchorableComponent : Component
{
[DataField("tool", customTypeSerializer: typeof(PrototypeIdSerializer<ToolQualityPrototype>))]

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 == MaterialPrototypeId && stack.Count >= Amount;
return entityManager.TryGetComponent(uid, out SharedStackComponent? stack) && stack.StackTypeId.Equals(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 == MaterialPrototypeId && otherStack.Count >= Amount)
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out SharedStackComponent? otherStack) && otherStack.StackTypeId.Equals(MaterialPrototypeId) && otherStack.Count >= Amount)
stack = otherStack;
else
stack = null;