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:
committed by
GitHub
parent
379555e933
commit
c5f7c61041
@@ -13,7 +13,7 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
/// insert/eject interactions.
|
||||
/// </summary>
|
||||
[RegisterComponent]
|
||||
[Friend(typeof(ItemSlotsSystem))]
|
||||
[Access(typeof(ItemSlotsSystem))]
|
||||
public sealed class ItemSlotsComponent : Component
|
||||
{
|
||||
/// <summary>
|
||||
@@ -60,7 +60,7 @@ namespace Content.Shared.Containers.ItemSlots
|
||||
/// insert/eject sounds.
|
||||
/// </summary>
|
||||
[DataDefinition]
|
||||
[Friend(typeof(ItemSlotsSystem))]
|
||||
[Access(typeof(ItemSlotsSystem))]
|
||||
public sealed class ItemSlot
|
||||
{
|
||||
[DataField("whitelist")]
|
||||
@@ -86,6 +86,7 @@ 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>
|
||||
@@ -97,6 +98,7 @@ 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>
|
||||
|
||||
Reference in New Issue
Block a user