From 580ca505befe9d9767bbceb3ae15d695962a2e97 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Fri, 15 Apr 2022 07:22:26 -0400
Subject: [PATCH] Partial revert.

Stop being bad.
---
 Dalamud/Game/Gui/GameGui.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Dalamud/Game/Gui/GameGui.cs b/Dalamud/Game/Gui/GameGui.cs
index 7891738c0..7896016e9 100644
--- a/Dalamud/Game/Gui/GameGui.cs
+++ b/Dalamud/Game/Gui/GameGui.cs
@@ -408,8 +408,16 @@ namespace Dalamud.Game.Gui
                     return IntPtr.Zero;
             }
 
-            var agent = agentModule->GetAgentByInternalID(id);
-            return (IntPtr)agent;
+            // Patch 6.1, 398 agents
+            for (var i = 0; i < 398; i++)
+            {
+                var agent = &agentModule->AgentArray[i];
+
+                if (agent->AddonId == id)
+                    return new IntPtr(agent);
+            }
+
+            return IntPtr.Zero;
         }
 
         /// <summary>