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.Server/Nutrition/Components/CigarComponent.cs
View File

@@ -5,7 +5,7 @@ namespace Content.Server.Nutrition.Components
/// <summary>
/// A disposable, single-use smokable.
/// </summary>
[RegisterComponent, Access(typeof(SmokingSystem))]
[RegisterComponent, Friend(typeof(SmokingSystem))]
public sealed class CigarComponent : Component
{
}

2
Content.Server/Nutrition/Components/DrinkComponent.cs
View File

@@ -7,7 +7,7 @@ using System.Threading;
namespace Content.Server.Nutrition.Components
{
[RegisterComponent]
[Access(typeof(DrinkSystem))]
[Friend(typeof(DrinkSystem))]
public sealed class DrinkComponent : Component
{
[DataField("solution")]

2
Content.Server/Nutrition/Components/FoodComponent.cs
View File

@@ -8,7 +8,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
namespace Content.Server.Nutrition.Components
{
[RegisterComponent, Access(typeof(FoodSystem))]
[RegisterComponent, Friend(typeof(FoodSystem))]
public sealed class FoodComponent : Component
{
[DataField("solution")]

2
Content.Server/Nutrition/Components/ForcefeedOnCollideComponent.cs
View File

@@ -5,7 +5,7 @@ namespace Content.Server.Nutrition.Components
/// <summary>
/// A food item with this component will be forcefully fed to anyone
/// </summary>
[RegisterComponent, Access(typeof(ForcefeedOnCollideSystem))]
[RegisterComponent, Friend(typeof(ForcefeedOnCollideSystem))]
public sealed class ForcefeedOnCollideComponent : Component
{
/// <summary>

2
Content.Server/Nutrition/Components/IngestionBlockerComponent.cs
View File

@@ -7,7 +7,7 @@ namespace Content.Server.Nutrition.EntitySystems;
/// In the event that more head-wear & mask functionality is added (like identity systems, or raising/lowering of
/// masks), then this component might become redundant.
/// </remarks>
[RegisterComponent, Access(typeof(FoodSystem), typeof(DrinkSystem))]
[RegisterComponent, Friend(typeof(FoodSystem), typeof(DrinkSystem))]
public sealed class IngestionBlockerComponent : Component
{
/// <summary>

2
Content.Server/Nutrition/Components/SliceableFoodComponent.cs
View File

@@ -3,7 +3,7 @@ using Content.Shared.Sound;
namespace Content.Server.Nutrition.Components
{
[RegisterComponent, Access(typeof(SliceableFoodSystem))]
[RegisterComponent, Friend(typeof(SliceableFoodSystem))]
internal sealed class SliceableFoodComponent : Component
{
[DataField("slice")]

2
Content.Server/Nutrition/Components/SmokableComponent.cs
View File

@@ -4,7 +4,7 @@ using Content.Shared.Smoking;
namespace Content.Server.Nutrition.Components
{
[RegisterComponent, Access(typeof(SmokingSystem))]
[RegisterComponent, Friend(typeof(SmokingSystem))]
public sealed class SmokableComponent : Component
{
[DataField("solution")]

2
Content.Server/Nutrition/Components/UtensilComponent.cs
View File

@@ -3,7 +3,7 @@ using Content.Shared.Sound;
namespace Content.Server.Nutrition.Components
{
[RegisterComponent, Access(typeof(UtensilSystem))]
[RegisterComponent, Friend(typeof(UtensilSystem))]
public sealed class UtensilComponent : Component
{
[DataField("types")]