ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-12 18:27:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support correct handling of offhands in changed items.

Browse source
This commit is contained in:
Ottermandias 2023-10-28 01:13:18 +02:00
parent c76a9ace24
commit 06e06b81e9
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra.Api

@ -1 +1 @@
Subproject commit f9069dfdf1f0a7011c3b0ea7c0be5330c42959dd Subproject commit 80f9793ef2ddaa50246b7112fde4d9b2098d8823

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit 4a639dbeebc3cbbaf8518b7626892855689f7440 Subproject commit e1a62d8e6b4e1d8c482253ad14850fd3dc372d86

3
Penumbra/Communication/ChangedItemClick.cs
View file

@ -1,5 +1,6 @@
using OtterGui.Classes; using OtterGui.Classes;
using Penumbra.Api.Enums; using Penumbra.Api.Enums;
using Penumbra.GameData.Enums;
namespace Penumbra.Communication; namespace Penumbra.Communication;
@ -7,7 +8,7 @@ namespace Penumbra.Communication;
/// Triggered when a Changed Item in Penumbra is clicked. /// Triggered when a Changed Item in Penumbra is clicked.
/// <list type="number"> /// <list type="number">
/// <item>Parameter is the clicked mouse button. </item> /// <item>Parameter is the clicked mouse button. </item>
/// <item>Parameter is the clicked object data if any.. </item> /// <item>Parameter is the clicked object data if any. </item>
/// </list> /// </list>
/// </summary> /// </summary>
public sealed class ChangedItemClick : EventWrapper<Action<MouseButton, object?>, ChangedItemClick.Priority> public sealed class ChangedItemClick : EventWrapper<Action<MouseButton, object?>, ChangedItemClick.Priority>

2
Penumbra/UI/ChangedItemDrawer.cs
View file

@ -285,7 +285,7 @@ public class ChangedItemDrawer : IDisposable
private object? Convert(object? data) private object? Convert(object? data)
{ {
if (data is EquipItem it) if (data is EquipItem it)
return _items.GetRow(it.ItemId.Id); return (_items.GetRow(it.ItemId.Id), it.Type);
return data; return data;
} }