Hack to fix autoattack issue with animlocks.

awgil · Apr 27, 2024 · 2d0ba37 · 2d0ba37
1 parent 2401b18
commit 2d0ba37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/BossMod/Debug/DebugAddon.cs b/BossMod/Debug/DebugAddon.cs
@@ -77,7 +77,7 @@ public void Draw()
                 }
             }
         }
-        if (_newHook.Length > 0 && uint.TryParse(_newHook, out var agentId) && agentId > 0 && !_agentRcvs.ContainsKey(agentId) && AgentModule.Instance()->GetAgentByInternalID(agentId) is var agent && agent != null)
+        if (_newHook.Length > 0 && uint.TryParse(_newHook, out var agentId) && agentId > 0 && !_agentRcvs.ContainsKey(agentId) && AgentModule.Instance()->GetAgentByInternalId((AgentId)agentId) is var agent && agent != null)
         {
             ImGui.SameLine();
             if (ImGui.Button("Hook agent!"))

diff --git a/BossMod/Framework/ActionManagerEx.cs b/BossMod/Framework/ActionManagerEx.cs
@@ -418,9 +418,9 @@ private void ProcessPacketActionEffectDetour(uint casterID, FFXIVClientStructs.F
         _processPacketActionEffectHook.Original(casterID, casterObj, targetPos, header, effects, targets);
         var currAnimLock = AnimationLock;
 
-        if (casterID != Service.ClientState.LocalPlayer?.ObjectId)
+        if (casterID != Service.ClientState.LocalPlayer?.ObjectId || header->SourceSequence == 0 && _lastReqSequence != 0)
         {
-            // non-player-initiated
+            // non-player-initiated; TODO: reconsider the condition for header->SourceSequence == 0 (e.g. autos) - could they happen while we wait for stuff like reholster?..
             if (currAnimLock != prevAnimLock)
                 Service.Log($"[AMEx] Animation lock updated by non-player-initiated action: #{header->SourceSequence} {casterID:X} {action} {prevAnimLock:f3} -> {currAnimLock:f3}");
             return;