tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix debug asserts when unequipping items (#38274)

Browse Source
This commit is contained in:
slarticodefast
2025-06-21 15:40:56 +02:00
committed by GitHub
parent a481f0bbbc
commit 092f88c16f
3 changed files with 19 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Content.Shared/Clothing/Components/ClothingComponent.cs
View File

@@ -11,12 +11,11 @@ namespace Content.Shared.Clothing.Components;
/// <summary>
/// This handles entities which can be equipped.
/// </summary>
[NetworkedComponent]
[RegisterComponent]
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
[Access(typeof(ClothingSystem), typeof(InventorySystem))]
public sealed partial class ClothingComponent : Component
{
[DataField("clothingVisuals")]
[DataField]
public Dictionary<string, List<PrototypeLayerData>> ClothingVisuals = new();
/// <summary>
@@ -25,8 +24,7 @@ public sealed partial class ClothingComponent : Component
[DataField]
public string? MappedLayer;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("quickEquip")]
[DataField]
public bool QuickEquip = true;
/// <summary>
@@ -36,22 +34,18 @@ public sealed partial class ClothingComponent : Component
/// <remarks>
/// Note that this may be a combination of different slot flags, not a singular bit.
/// </remarks>
[ViewVariables(VVAccess.ReadWrite)]
[DataField(required: true)]
[Access(typeof(ClothingSystem), typeof(InventorySystem), Other = AccessPermissions.ReadExecute)]
public SlotFlags Slots = SlotFlags.NONE;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("equipSound")]
[DataField]
public SoundSpecifier? EquipSound;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("unequipSound")]
[DataField]
public SoundSpecifier? UnequipSound;
[Access(typeof(ClothingSystem))]
[ViewVariables(VVAccess.ReadWrite)]
[DataField("equippedPrefix")]
[DataField, AutoNetworkedField]
public string? EquippedPrefix;
/// <summary>
@@ -59,11 +53,9 @@ public sealed partial class ClothingComponent : Component
/// useful when prototyping INNERCLOTHING items into OUTERCLOTHING items without duplicating/modifying RSIs etc.
/// </summary>
[Access(typeof(ClothingSystem))]
[ViewVariables(VVAccess.ReadWrite)]
[DataField("equippedState")]
[DataField, AutoNetworkedField]
public string? EquippedState;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("sprite")]
public string? RsiPath;
@@ -72,7 +64,7 @@ public sealed partial class ClothingComponent : Component
/// Note that this being non-null does not mean the clothing is considered "worn" or "equipped" unless the slot
/// satisfies the <see cref="Slots"/> flags.
/// </summary>
[DataField]
[DataField, AutoNetworkedField]
public string? InSlot;
// TODO CLOTHING
// Maybe keep this null unless its in a valid slot?
@@ -82,16 +74,16 @@ public sealed partial class ClothingComponent : Component
/// <summary>
/// Slot flags of the slot the clothing is currently in. See also <see cref="InSlot"/>.
/// </summary>
[DataField]
[DataField, AutoNetworkedField]
public SlotFlags? InSlotFlag;
// TODO CLOTHING
// Maybe keep this null unless its in a valid slot?
// And when doing this, combine InSlot and InSlotFlag, as it'd be a breaking change for downstreams anyway
[DataField, ViewVariables(VVAccess.ReadWrite)]
[DataField]
public TimeSpan EquipDelay = TimeSpan.Zero;
[DataField, ViewVariables(VVAccess.ReadWrite)]
[DataField]
public TimeSpan UnequipDelay = TimeSpan.Zero;
/// <summary>
@@ -102,17 +94,6 @@ public sealed partial class ClothingComponent : Component
public TimeSpan StripDelay = TimeSpan.Zero;
}
[Serializable, NetSerializable]
public sealed class ClothingComponentState : ComponentState
{
public string? EquippedPrefix;
public ClothingComponentState(string? equippedPrefix)
{
EquippedPrefix = equippedPrefix;
}
}
public enum ClothingMask : byte
{
NoMask = 0,

17
Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
View File

@@ -21,8 +21,7 @@ public abstract class ClothingSystem : EntitySystem
base.Initialize();
SubscribeLocalEvent<ClothingComponent, UseInHandEvent>(OnUseInHand);
SubscribeLocalEvent<ClothingComponent, ComponentGetState>(OnGetState);
SubscribeLocalEvent<ClothingComponent, ComponentHandleState>(OnHandleState);
SubscribeLocalEvent<ClothingComponent, AfterAutoHandleStateEvent>(AfterAutoHandleState);
SubscribeLocalEvent<ClothingComponent, GotEquippedEvent>(OnGotEquipped);
SubscribeLocalEvent<ClothingComponent, GotUnequippedEvent>(OnGotUnequipped);
@@ -84,6 +83,7 @@ public abstract class ClothingSystem : EntitySystem
{
component.InSlot = args.Slot;
component.InSlotFlag = args.SlotFlags;
Dirty(uid, component);
if ((component.Slots & args.SlotFlags) == SlotFlags.NONE)
return;
@@ -108,19 +108,12 @@ public abstract class ClothingSystem : EntitySystem
component.InSlot = null;
component.InSlotFlag = null;
Dirty(uid, component);
}
private void OnGetState(EntityUid uid, ClothingComponent component, ref ComponentGetState args)
private void AfterAutoHandleState(Entity<ClothingComponent> ent, ref AfterAutoHandleStateEvent args)
{
args.State = new ClothingComponentState(component.EquippedPrefix);
}
private void OnHandleState(EntityUid uid, ClothingComponent component, ref ComponentHandleState args)
{
if (args.Current is not ClothingComponentState state)
return;
SetEquippedPrefix(uid, state.EquippedPrefix, component);
_itemSys.VisualsChanged(ent.Owner);
}
private void OnEquipDoAfter(Entity<ClothingComponent> ent, ref ClothingEquipDoAfterEvent args)

4
Content.Shared/Clothing/EntitySystems/MaskSystem.cs
View File

@@ -78,10 +78,10 @@ public sealed class MaskSystem : EntitySystem
if (mask.ToggleActionEntity is { } action)
_actionSystem.SetToggled(action, mask.IsToggled);
var maskEv = new ItemMaskToggledEvent((wearer, mask), wearer);
var maskEv = new ItemMaskToggledEvent((uid, mask), wearer);
RaiseLocalEvent(uid, ref maskEv);
var wearerEv = new WearerMaskToggledEvent((wearer, mask));
var wearerEv = new WearerMaskToggledEvent((uid, mask));
RaiseLocalEvent(wearer, ref wearerEv);
}