From 06e06b81e9e095d91ba7f05a3909fa62bf7e7731 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Sat, 28 Oct 2023 01:13:18 +0200
Subject: [PATCH] Support correct handling of offhands in changed items.

---
 Penumbra.Api                               | 2 +-
 Penumbra.GameData                          | 2 +-
 Penumbra/Communication/ChangedItemClick.cs | 3 ++-
 Penumbra/UI/ChangedItemDrawer.cs           | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Penumbra.Api b/Penumbra.Api
index f9069dfd..80f9793e 160000
--- a/Penumbra.Api
+++ b/Penumbra.Api
@@ -1 +1 @@
-Subproject commit f9069dfdf1f0a7011c3b0ea7c0be5330c42959dd
+Subproject commit 80f9793ef2ddaa50246b7112fde4d9b2098d8823
diff --git a/Penumbra.GameData b/Penumbra.GameData
index 4a639dbe..e1a62d8e 160000
--- a/Penumbra.GameData
+++ b/Penumbra.GameData
@@ -1 +1 @@
-Subproject commit 4a639dbeebc3cbbaf8518b7626892855689f7440
+Subproject commit e1a62d8e6b4e1d8c482253ad14850fd3dc372d86
diff --git a/Penumbra/Communication/ChangedItemClick.cs b/Penumbra/Communication/ChangedItemClick.cs
index 1e5bc863..ea389bb6 100644
--- a/Penumbra/Communication/ChangedItemClick.cs
+++ b/Penumbra/Communication/ChangedItemClick.cs
@@ -1,5 +1,6 @@
 using OtterGui.Classes;
 using Penumbra.Api.Enums;
+using Penumbra.GameData.Enums;
 
 namespace Penumbra.Communication;
 
@@ -7,7 +8,7 @@ namespace Penumbra.Communication;
 /// Triggered when a Changed Item in Penumbra is clicked.
 /// <list type="number">
 ///     <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>
 /// </summary>
 public sealed class ChangedItemClick : EventWrapper<Action<MouseButton, object?>, ChangedItemClick.Priority>
diff --git a/Penumbra/UI/ChangedItemDrawer.cs b/Penumbra/UI/ChangedItemDrawer.cs
index 324c354a..3c74aa20 100644
--- a/Penumbra/UI/ChangedItemDrawer.cs
+++ b/Penumbra/UI/ChangedItemDrawer.cs
@@ -285,7 +285,7 @@ public class ChangedItemDrawer : IDisposable
     private object? Convert(object? data)
     {
         if (data is EquipItem it)
-            return _items.GetRow(it.ItemId.Id);
+            return (_items.GetRow(it.ItemId.Id), it.Type);
 
         return data;
     }