From 62d434719687ef6d44e9f0e82be95ee12221d220 Mon Sep 17 00:00:00 2001
From: rootdarkarchon <root.darkarchon@outlook.com>
Date: Sun, 19 Feb 2023 23:37:25 +0100
Subject: [PATCH] I hate merges

---
 MareSynchronos/Factories/CharacterDataFactory.cs | 9 ++++++---
 MareSynchronos/Managers/CachedPlayer.cs          | 9 ++-------
 MareSynchronos/MareSynchronos.csproj             | 2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/MareSynchronos/Factories/CharacterDataFactory.cs b/MareSynchronos/Factories/CharacterDataFactory.cs
index 7a6bb6f..e6b83b2 100644
--- a/MareSynchronos/Factories/CharacterDataFactory.cs
+++ b/MareSynchronos/Factories/CharacterDataFactory.cs
@@ -151,9 +151,12 @@ public class CharacterDataFactory : MediatorSubscriberBase
         Task<string> getPalettePlusData = new(() => _ipcManager.PalettePlusBuildPalette());
         _processingQueue.Enqueue(getPalettePlusData);
         Task.WaitAll(new[] { getGlamourerData, getCustomizeData, getPalettePlusData }, token);
-        previousData.GlamourerString[playerRelatedObject.ObjectKind] = getGlamourerData.Result;
-        previousData.CustomizePlusScale = getCustomizeData.Result;
-        previousData.PalettePlusPalette = getPalettePlusData.Result;
+        previousData.GlamourerString[playerRelatedObject.ObjectKind] = await getGlamourerData.ConfigureAwait(true);
+        previousData.CustomizePlusScale = await getCustomizeData.ConfigureAwait(true);
+        previousData.PalettePlusPalette = await getPalettePlusData.ConfigureAwait(true);
+        _logger.LogDebug("Glamourer is now: {data}", previousData.GlamourerString[playerRelatedObject.ObjectKind]);
+        _logger.LogDebug("Customize is now: {data}", previousData.CustomizePlusScale);
+        _logger.LogDebug("Palette is now: {data}", previousData.PalettePlusPalette);
 
         // gather static replacements from render model
         var (forwardResolve, reverseResolve) = BuildDataFromModel(objectKind, charaPointer, token);
diff --git a/MareSynchronos/Managers/CachedPlayer.cs b/MareSynchronos/Managers/CachedPlayer.cs
index 4a156e7..f8251d6 100644
--- a/MareSynchronos/Managers/CachedPlayer.cs
+++ b/MareSynchronos/Managers/CachedPlayer.cs
@@ -55,7 +55,7 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
 
         if (string.Equals(characterData.DataHash.Value, _cachedData.DataHash.Value, StringComparison.Ordinal) && !forced) return;
 
-        CheckUpdatedData(_cachedData, characterData, forced, out var charaDataToUpdate);
+        CheckUpdatedData(_cachedData.DeepClone(), characterData, forced, out var charaDataToUpdate);
 
         NotifyForMissingPlugins(characterData, warning);
 
@@ -121,7 +121,6 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
                 {
                     _logger.LogDebug("Updating {object}/{kind} (Diff manip data) => {change}", this, objectKind, PlayerChanges.Mods);
                     charaDataToUpdate[objectKind].Add(PlayerChanges.Mods);
-                    continue;
                 }
 
                 bool heelsOffsetDifferent = oldData.HeelsOffset != newData.HeelsOffset;
@@ -129,7 +128,6 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
                 {
                     _logger.LogDebug("Updating {object}/{kind} (Diff heels data) => {change}", this, objectKind, PlayerChanges.Heels);
                     charaDataToUpdate[objectKind].Add(PlayerChanges.Heels);
-                    continue;
                 }
 
                 bool customizeDataDifferent = !string.Equals(oldData.CustomizePlusData, newData.CustomizePlusData, StringComparison.Ordinal);
@@ -137,7 +135,6 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
                 {
                     _logger.LogDebug("Updating {object}/{kind} (Diff customize data) => {change}", this, objectKind, PlayerChanges.Customize);
                     charaDataToUpdate[objectKind].Add(PlayerChanges.Customize);
-                    continue;
                 }
 
                 bool palettePlusDataDifferent = !string.Equals(oldData.PalettePlusData, newData.PalettePlusData, StringComparison.Ordinal);
@@ -145,7 +142,6 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
                 {
                     _logger.LogDebug("Updating {object}/{kind} (Diff palette data) => {change}", this, objectKind, PlayerChanges.Palette);
                     charaDataToUpdate[objectKind].Add(PlayerChanges.Palette);
-                    continue;
                 }
             }
         }
@@ -153,7 +149,7 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
         foreach (var data in charaDataToUpdate.ToList())
         {
             if (!data.Value.Any()) charaDataToUpdate.Remove(data.Key);
-            else charaDataToUpdate[data.Key] = data.Value.OrderBy(p => (int)p).ToHashSet();
+            else charaDataToUpdate[data.Key] = data.Value.OrderByDescending(p => (int)p).ToHashSet();
         }
     }
 
@@ -331,7 +327,6 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
                     }
                     break;
             }
-            break;
         }
 
         if (handler != _currentOtherChara) handler.Dispose();
diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index 5dc00c6..ee907cd 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>0.7.34</Version>
+    <Version>0.7.35</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>