tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

6
Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Shared.Containers.ItemSlots
/// insert/eject interactions.
/// </summary>
[RegisterComponent]
[Access(typeof(ItemSlotsSystem))]
[Friend(typeof(ItemSlotsSystem))]
public sealed class ItemSlotsComponent : Component
{
/// <summary>
@@ -60,7 +60,7 @@ namespace Content.Shared.Containers.ItemSlots
/// insert/eject sounds.
/// </summary>
[DataDefinition]
[Access(typeof(ItemSlotsSystem))]
[Friend(typeof(ItemSlotsSystem))]
public sealed class ItemSlot
{
[DataField("whitelist")]
@@ -86,7 +86,6 @@ namespace Content.Shared.Containers.ItemSlots
/// of the currently held or currently inserted entity instead.
/// </remarks>
[DataField("name", readOnly: true)]
[Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
public string Name = string.Empty;
/// <summary>
@@ -98,7 +97,6 @@ namespace Content.Shared.Containers.ItemSlots
/// when mapping.
/// </remarks>
[DataField("startingItem", readOnly: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
[Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
public string? StartingItem;
/// <summary>