From abcb1a622274b87c2566fe99f1cd4c0238543efc Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Mon, 28 Aug 2023 12:17:15 +0200
Subject: [PATCH] Add Nothing to certain offhands.

---
 Glamourer/Gui/Equipment/WeaponCombo.cs | 2 +-
 Penumbra.GameData                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Glamourer/Gui/Equipment/WeaponCombo.cs b/Glamourer/Gui/Equipment/WeaponCombo.cs
index 9540dc1..667fad2 100644
--- a/Glamourer/Gui/Equipment/WeaponCombo.cs
+++ b/Glamourer/Gui/Equipment/WeaponCombo.cs
@@ -89,7 +89,7 @@ public sealed class WeaponCombo : FilterComboCache<EquipItem>
         if (!items.ItemService.AwaitedService.TryGetValue(type, out var list))
             return Array.Empty<EquipItem>();
 
-        if (type.ToSlot() is EquipSlot.OffHand && !type.IsOffhandType())
+        if (type.AllowsNothing())
             return list.OrderBy(e => e.Name).Prepend(ItemManager.NothingItem(type)).ToList();
 
         return list.OrderBy(e => e.Name).ToList();
diff --git a/Penumbra.GameData b/Penumbra.GameData
index d84508e..a9ec90d 160000
--- a/Penumbra.GameData
+++ b/Penumbra.GameData
@@ -1 +1 @@
-Subproject commit d84508ea1a607976525265e8f75a329667eec0e5
+Subproject commit a9ec90d1ef3feb6e38cc309f88ecff0713313533