From 21fd54e38de8a440cc81b3a26072416ac9897d7e Mon Sep 17 00:00:00 2001
From: rootdarkarchon <root.darkarchon@outlook.com>
Date: Mon, 6 Mar 2023 23:24:45 +0100
Subject: [PATCH] move assignment completely to framework

---
 MareSynchronos/Managers/CachedPlayer.cs |  8 ++++----
 MareSynchronos/MareSynchronos.csproj    | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/MareSynchronos/Managers/CachedPlayer.cs b/MareSynchronos/Managers/CachedPlayer.cs
index d20a020..3e163b4 100644
--- a/MareSynchronos/Managers/CachedPlayer.cs
+++ b/MareSynchronos/Managers/CachedPlayer.cs
@@ -280,10 +280,10 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
         return OnlineUser.User.AliasOrUID + ":" + PlayerName + ":" + ((PlayerCharacter != IntPtr.Zero) ? "HasChar" : "NoChar");
     }
 
-    private void ApplyBaseData(Guid applicationId, Dictionary<string, string> moddedPaths, string manipulationData)
+    private async Task ApplyBaseData(Guid applicationId, Dictionary<string, string> moddedPaths, string manipulationData)
     {
-        _ipcManager.PenumbraRemoveTemporaryCollection(_logger, applicationId, PlayerName!);
-        _ipcManager.PenumbraSetTemporaryMods(_logger, applicationId, PlayerName!, moddedPaths, manipulationData);
+        await _dalamudUtil.RunOnFrameworkThread(() => _ipcManager.PenumbraRemoveTemporaryCollection(_logger, applicationId, PlayerName!)).ConfigureAwait(false);
+        await _dalamudUtil.RunOnFrameworkThread(() => _ipcManager.PenumbraSetTemporaryMods(_logger, applicationId, PlayerName!, moddedPaths, manipulationData)).ConfigureAwait(false);
     }
 
     private async Task ApplyCustomizationData(Guid applicationId, KeyValuePair<ObjectKind, HashSet<PlayerChanges>> changes, API.Data.CharacterData charaData)
@@ -406,7 +406,7 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable
 
                 if (updateModdedPaths && (moddedPaths.Any() || !string.IsNullOrEmpty(charaData.ManipulationData)))
                 {
-                    ApplyBaseData(_applicationId, moddedPaths, charaData.ManipulationData);
+                    await ApplyBaseData(_applicationId, moddedPaths, charaData.ManipulationData).ConfigureAwait(false);
                 }
 
                 foreach (var kind in updatedData)
diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index 5563f12..3358d74 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>0.7.41</Version>
+    <Version>0.7.42</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>
@@ -28,14 +28,14 @@
   <ItemGroup>
     <PackageReference Include="DalamudPackager" Version="2.1.10" />
     <PackageReference Include="lz4net" Version="1.0.15.93" />
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.13">
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.19">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.3" />
     <PackageReference Include="Penumbra.Api" Version="1.0.7" />
-    <PackageReference Include="Penumbra.String" Version="1.0.1" />
+    <PackageReference Include="Penumbra.String" Version="1.0.3" />
   </ItemGroup>
 
   <PropertyGroup>