Merge pull request #207 from Cazzar/fix-gpose-with-mare-pairs

Fix up applying scales applied via IPC when entering gpose
XIV-Tools · Oct 17, 2023 · a81e74e · a81e74e
2 parents 04e0084 + cdc0379
commit a81e74e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CustomizePlus/CustomizePlus.csproj b/CustomizePlus/CustomizePlus.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>1.2.6.0</Version>
+    <Version>1.2.6.1</Version>
     <Description>CustomizePlus</Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/XIV-Tools/CustomizePlus</PackageProjectUrl>

diff --git a/CustomizePlus/Data/Profile/ProfileManager.cs b/CustomizePlus/Data/Profile/ProfileManager.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using CustomizePlus.Helpers;
+using CustomizePlus.Services;
 using Dalamud.Game.ClientState.Objects.Enums;
 
 namespace CustomizePlus.Data.Profile
@@ -265,6 +266,7 @@ public void AddTemporaryProfile(nint characterAddress, CharacterProfile prof)
         {
             prof.Enabled = true;
             prof.Address = characterAddress;
+
             var key = TempLocalProfiles.Keys.FirstOrDefault(f => f.Address == characterAddress);
             if (key != null)
             {
@@ -382,12 +384,11 @@ public IEnumerable<CharacterProfile> GetProfilesByGameObject(Dalamud.Game.Client
                 }
             }
 
-            var hasTempProfile = TempLocalProfiles.Any(f => obj.Address == f.Key.Address);
-            if (hasTempProfile)
+            var (tempCharacter, matchingProfile) = TempLocalProfiles.FirstOrDefault(f => obj.Address == f.Key.Address || (obj.ObjectIndex is >= 200 and < 300 && f.Value.AppliesTo(obj)));
+            if (matchingProfile != null)
             {
-                var matchingProfile = TempLocalProfiles.First(f => obj.Address == f.Key.Address);
-                matchingProfile.Key.Processed = true;
-                output.Add(matchingProfile.Value);
+                tempCharacter.Processed = true;
+                output.Add(matchingProfile);
                 return output;
             }