From 3a4fe524d9ce5524375c3c17e5af3ec20ed911ae Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Mon, 24 Jul 2023 13:28:37 +0200
Subject: [PATCH] Fix some more stupid fist weapon shit.

---
 Glamourer/State/StateListener.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Glamourer/State/StateListener.cs b/Glamourer/State/StateListener.cs
index 1694d9f..5777311 100644
--- a/Glamourer/State/StateListener.cs
+++ b/Glamourer/State/StateListener.cs
@@ -214,10 +214,7 @@ public class StateListener : IDisposable
     {
         // Fist weapon gauntlet hack.
         if (slot is EquipSlot.OffHand && weapon.Value.Variant == 0 && weapon.Value.Set.Value != 0 && _lastFistOffhand.Set.Value != 0)
-        {
-            weapon.Value     = _lastFistOffhand;
-            _lastFistOffhand = CharacterWeapon.Empty;
-        }
+            weapon.Value = _lastFistOffhand;
 
         if (!actor.Identifier(_actors.AwaitedService, out var identifier)
          || !_manager.TryGetValue(identifier, out var state))
@@ -266,10 +263,19 @@ public class StateListener : IDisposable
     /// <summary> Update base data for a single changed equipment slot. </summary>
     private UpdateState UpdateBaseData(Actor actor, ActorState state, EquipSlot slot, CharacterArmor armor)
     {
+        bool FistWeaponGauntletHack()
+        {
+            if (slot is not EquipSlot.Hands)
+                return false;
+
+            var offhand = actor.GetOffhand();
+            return offhand.Variant == 0 && armor.Set.Value == offhand.Set.Value;
+        }
+
         var actorArmor = actor.GetArmor(slot);
         // The actor armor does not correspond to the model armor, thus the actor is transformed.
         // This also prevents it from changing values due to hat state.
-        if (actorArmor.Value != armor.Value && armor.Set.Value != actor.GetOffhand().Set.Value)
+        if (actorArmor.Value != armor.Value && !FistWeaponGauntletHack())
             return UpdateState.Transformed;
 
         var baseData = state.BaseData.Armor(slot);