diff --git a/Content.Client/GameObjects/Components/Items/HandsComponent.cs b/Content.Client/GameObjects/Components/Items/HandsComponent.cs index 0c13e0800e..236eb6cd64 100644 --- a/Content.Client/GameObjects/Components/Items/HandsComponent.cs +++ b/Content.Client/GameObjects/Components/Items/HandsComponent.cs @@ -145,7 +145,7 @@ namespace Content.Client.GameObjects.Components.Items if (!entity.TryGetComponent(out ItemComponent item)) return; - var maybeInHands = item.GetInHandStateInfo(name); + var maybeInHands = item.GetInHandStateInfo(hand.Location); if (!maybeInHands.HasValue) { diff --git a/Content.Client/GameObjects/Components/Items/ItemComponent.cs b/Content.Client/GameObjects/Components/Items/ItemComponent.cs index 1dd476db1f..5434449458 100644 --- a/Content.Client/GameObjects/Components/Items/ItemComponent.cs +++ b/Content.Client/GameObjects/Components/Items/ItemComponent.cs @@ -40,15 +40,16 @@ namespace Content.Client.GameObjects.Components.Items } } - public (RSI rsi, RSI.StateId stateId)? GetInHandStateInfo(string hand) + public (RSI rsi, RSI.StateId stateId)? GetInHandStateInfo(HandLocation hand) { if (RsiPath == null) { return null; } + var handName = hand.ToString().ToLowerInvariant(); var rsi = GetRSI(); - var stateId = EquippedPrefix != null ? $"{EquippedPrefix}-inhand-{hand}" : $"inhand-{hand}"; + var stateId = EquippedPrefix != null ? $"{EquippedPrefix}-inhand-{handName}" : $"inhand-{handName}"; if (rsi.TryGetState(stateId, out _)) { return (rsi, stateId);