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

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

Browse Source
This commit is contained in:
Pieter-Jan Briers
2022-06-07 15:26:28 +02:00
committed by GitHub
parent cecf87997b
commit a323ba8223
164 changed files with 199 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Botany/Components/LogComponent.cs
View File

@@ -6,7 +6,7 @@ namespace Content.Server.Botany.Components;
// TODO: This should probably be merged with SliceableFood somehow or made into a more generic Choppable.
[RegisterComponent]
[Friend(typeof(LogSystem))]
[Access(typeof(LogSystem))]
public sealed class LogComponent : Component
{
[DataField("spawnedPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]

2
Content.Server/Botany/Components/ProduceComponent.cs
View File

@@ -4,7 +4,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
namespace Content.Server.Botany.Components;
[RegisterComponent]
[Friend(typeof(BotanySystem))]
[Access(typeof(BotanySystem))]
public sealed class ProduceComponent : Component
{
[DataField("targetSolution")] public string SolutionName { get; set; } = "food";

2
Content.Server/Botany/Components/SeedComponent.cs
View File

@@ -3,7 +3,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
namespace Content.Server.Botany.Components
{
[RegisterComponent, Friend(typeof(BotanySystem))]
[RegisterComponent, Access(typeof(BotanySystem))]
public sealed class SeedComponent : Component
{
/// <summary>

2
Content.Server/Botany/Components/SeedExtractorComponent.cs
View File

@@ -3,7 +3,7 @@ using Content.Server.Botany.Systems;
namespace Content.Server.Botany.Components;
[RegisterComponent]
[Friend(typeof(SeedExtractorSystem))]
[Access(typeof(SeedExtractorSystem))]
public sealed class SeedExtractorComponent : Component
{
// TODO: Upgradeable machines.

2
Content.Server/Botany/SeedPrototype.cs
View File

@@ -63,7 +63,7 @@ public struct SeedChemQuantity
// TODO reduce the number of friends to a reasonable level. Requires ECS-ing things like plant holder component.
[Virtual, DataDefinition]
[Friend(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent))]
[Access(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent))]
public class SeedData
{
#region Tracking