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

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

View File

@@ -8,7 +8,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
namespace Content.Server.Body.Components
{
[RegisterComponent, Friend(typeof(BloodstreamSystem))]
[RegisterComponent, Access(typeof(BloodstreamSystem))]
public sealed class BloodstreamComponent : Component
{
public static string DefaultChemicalsSolutionName = "chemicals";
@@ -129,6 +129,7 @@ namespace Content.Server.Body.Components
/// Internal solution for reagent storage
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[Access(typeof(BloodstreamSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
public Solution ChemicalSolution = default!;
/// <summary>

View File

@@ -2,7 +2,7 @@
namespace Content.Server.Body.Components
{
[RegisterComponent, Friend(typeof(BrainSystem))]
[RegisterComponent, Access(typeof(BrainSystem))]
public sealed class BrainComponent : Component
{
}

View File

@@ -5,10 +5,11 @@ using Content.Shared.Chemistry.Components;
namespace Content.Server.Body.Components;
[RegisterComponent, Friend(typeof(LungSystem))]
[RegisterComponent, Access(typeof(LungSystem))]
public sealed class LungComponent : Component
{
[DataField("air")]
[Access(typeof(LungSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
public GasMixture Air { get; set; } = new()
{
Volume = 6,
@@ -16,5 +17,6 @@ public sealed class LungComponent : Component
};
[ViewVariables]
[Access(typeof(LungSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
public Solution LungSolution = default!;
}

View File

@@ -9,7 +9,7 @@ namespace Content.Server.Body.Components
/// <summary>
/// Handles metabolizing various reagents with given effects.
/// </summary>
[RegisterComponent, Friend(typeof(MetabolizerSystem))]
[RegisterComponent, Access(typeof(MetabolizerSystem))]
public sealed class MetabolizerComponent : Component
{
public float AccumulatedFrametime = 0.0f;
@@ -40,6 +40,7 @@ namespace Content.Server.Body.Components
/// List of metabolizer types that this organ is. ex. Human, Slime, Felinid, w/e.
/// </summary>
[DataField("metabolizerTypes", customTypeSerializer:typeof(PrototypeIdHashSetSerializer<MetabolizerTypePrototype>))]
[Access(typeof(MetabolizerSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
public HashSet<string>? MetabolizerTypes = null;
/// <summary>

View File

@@ -3,7 +3,7 @@ using Content.Shared.Damage;
namespace Content.Server.Body.Components
{
[RegisterComponent, Friend(typeof(RespiratorSystem))]
[RegisterComponent, Access(typeof(RespiratorSystem))]
public sealed class RespiratorComponent : Component
{
/// <summary>

View File

@@ -3,7 +3,7 @@ using Content.Shared.FixedPoint;
namespace Content.Server.Body.Components
{
[RegisterComponent, Friend(typeof(StomachSystem))]
[RegisterComponent, Access(typeof(StomachSystem))]
public sealed class StomachComponent : Component
{
public float AccumulatedFrameTime;

View File

@@ -3,7 +3,7 @@ using Content.Server.Body.Systems;
namespace Content.Server.Body.Components;
[RegisterComponent]
[Friend(typeof(ThermalRegulatorSystem))]
[Access(typeof(ThermalRegulatorSystem))]
public sealed class ThermalRegulatorComponent : Component
{
/// <summary>