Hotfix: Endless loop while generating

RenNagasaki · Aug 10, 2024 · d032048 · d032048
1 parent 85b5a14
commit d032048
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/Echokraut/Echokraut.csproj b/Echokraut/Echokraut.csproj
@@ -3,7 +3,7 @@
   <Import Project="Dalamud.Plugin.Bootstrap.targets" />
 
   <PropertyGroup>
-    <Version>0.10.5.4</Version>
+    <Version>0.10.5.5</Version>
     <Description>A TTS Dalamud Plugin that breaks the silence! For self hosted TTS Services.</Description>
     <PackageProjectUrl>https://github.com/RenNagasaki/Echokraut</PackageProjectUrl>
     <PackageLicenseExpression>AGPL-3.0-or-later</PackageLicenseExpression>

diff --git a/Echokraut/Helper/AddonBattleTalkHelper.cs b/Echokraut/Helper/AddonBattleTalkHelper.cs
@@ -30,6 +30,7 @@ private record struct AddonBattleTalkState(string? Speaker, string? Text);
     private readonly Echokraut plugin;
     public bool nextIsVoice = false;
     public DateTime timeNextVoice = DateTime.Now;
+    private AddonBattleTalkState lastValue;
 
     public AddonBattleTalkHelper(Echokraut plugin, IAddonLifecycle addonLifecycle, IClientState clientState, IObjectTable objects, Configuration config)
     {
@@ -75,6 +76,12 @@ private unsafe AddonBattleTalkState GetTalkAddonState(AddonBattleTalk* addonTalk
 
     private void Mutate(AddonBattleTalkState nextValue)
     {
+        if (lastValue.Equals(nextValue))
+        {
+            return;
+        }
+
+        lastValue = nextValue;
         HandleChange(nextValue);
     }
 

diff --git a/Echokraut/Helper/AddonTalkHelper.cs b/Echokraut/Helper/AddonTalkHelper.cs
@@ -4,6 +4,9 @@
 using Echokraut.TextToTalk.Utils;
 using Dalamud.Configuration;
 using Echokraut.DataClasses;
+using static Dalamud.Plugin.Services.IFramework;
+using System.IO;
+using Dalamud.Game.ClientState.Conditions;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using Echokraut.Enums;
 using Echokraut.Utils;
@@ -26,6 +29,7 @@ private record struct AddonTalkState(string? Speaker, string? Text);
     public DateTime timeNextVoice = DateTime.Now;
 
     public static nint Address { get; set; }
+    private AddonTalkState lastValue;
 
     public AddonTalkHelper(Echokraut plugin, IAddonLifecycle addonLifecycle, IClientState clientState, IObjectTable objects, Configuration config)
     {
@@ -60,6 +64,12 @@ private unsafe void Handle(AddonTalk* addonTalk)
 
     private void Mutate(AddonTalkState nextValue)
     {
+        if (lastValue.Equals(nextValue))
+        {
+            return;
+        }
+
+        lastValue = nextValue;
         HandleChange(nextValue);
     }
 
@@ -126,6 +136,12 @@ private void HandleChange(AddonTalkState state)
         return addonTalk == null ? null : TalkUtils.ReadTalkAddon(addonTalk);
     }
 
+    public unsafe bool IsVisible()
+    {
+        var addonTalk = GetAddonTalk();
+        return addonTalk != null && addonTalk->AtkUnitBase.IsVisible;
+    }
+
     private unsafe AddonTalk* GetAddonTalk()
     {
         return (AddonTalk*)Address.ToPointer();