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

3
Content.Server/Body/Components/BloodstreamComponent.cs
View File

@@ -8,7 +8,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
namespace Content.Server.Body.Components
{
[RegisterComponent, Access(typeof(BloodstreamSystem))]
[RegisterComponent, Friend(typeof(BloodstreamSystem))]
public sealed class BloodstreamComponent : Component
{
public static string DefaultChemicalsSolutionName = "chemicals";
@@ -129,7 +129,6 @@ 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>

2
Content.Server/Body/Components/BrainComponent.cs
View File

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

4
Content.Server/Body/Components/LungComponent.cs
View File

@@ -5,11 +5,10 @@ using Content.Shared.Chemistry.Components;
namespace Content.Server.Body.Components;
[RegisterComponent, Access(typeof(LungSystem))]
[RegisterComponent, Friend(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,
@@ -17,6 +16,5 @@ public sealed class LungComponent : Component
};
[ViewVariables]
[Access(typeof(LungSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
public Solution LungSolution = default!;
}

3
Content.Server/Body/Components/MetabolizerComponent.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Server.Body.Components
/// <summary>
/// Handles metabolizing various reagents with given effects.
/// </summary>
[RegisterComponent, Access(typeof(MetabolizerSystem))]
[RegisterComponent, Friend(typeof(MetabolizerSystem))]
public sealed class MetabolizerComponent : Component
{
public float AccumulatedFrametime = 0.0f;
@@ -40,7 +40,6 @@ 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>

2
Content.Server/Body/Components/RespiratorComponent.cs
View File

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

2
Content.Server/Body/Components/StomachComponent.cs
View File

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

2
Content.Server/Body/Components/ThermalRegulatorComponent.cs
View File

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