ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2026-02-21 06:57:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix offhand changes with empty offhand.

Browse source
This commit is contained in:
Ottermandias 2026-01-28 17:58:14 +01:00
parent 74517d8ec5
commit e96134a134
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Glamourer/State/StateListener.cs
View file

@ -9,7 +9,6 @@ using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs; using Penumbra.GameData.Structs;
using Dalamud.Game.ClientState.Conditions; using Dalamud.Game.ClientState.Conditions;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game.Character;
using FFXIVClientStructs.FFXIV.Client.Game.Object; using FFXIVClientStructs.FFXIV.Client.Game.Object;
using Glamourer.GameData; using Glamourer.GameData;
using Penumbra.GameData.DataContainers; using Penumbra.GameData.DataContainers;
@ -602,14 +601,21 @@ public class StateListener : IDisposable
change = UpdateState.Change; change = UpdateState.Change;
} }
if (baseData.Skeleton.Id != weapon.Skeleton.Id || baseData.Weapon.Id != weapon.Weapon.Id || baseData.Variant != weapon.Variant) var idsDiffer = baseData.Skeleton.Id != weapon.Skeleton.Id
|| baseData.Weapon.Id != weapon.Weapon.Id
|| baseData.Variant != weapon.Variant;
// Special case when nothing is equipped to the offhand which is already nothing, but we need to update the type.
var nothingDiffers = baseData.Skeleton.Id is 0 && slot is EquipSlot.OffHand;
if (idsDiffer || nothingDiffers)
{ {
if (_isPlayerNpc) if (_isPlayerNpc)
return UpdateState.Transformed; return UpdateState.Transformed;
var item = _items.Identify(slot, weapon.Skeleton, weapon.Weapon, weapon.Variant, var item = _items.Identify(slot, weapon.Skeleton, weapon.Weapon, weapon.Variant,
slot is EquipSlot.OffHand ? state.BaseData.MainhandType : FullEquipType.Unknown); slot is EquipSlot.OffHand ? state.BaseData.MainhandType : FullEquipType.Unknown);
state.BaseData.SetItem(slot, item); if (idsDiffer || item.Type != state.BaseData.OffhandType)
state.BaseData.SetItem(slot, item);
change = UpdateState.Change; change = UpdateState.Change;
} }