From 01723152d8d8a3e2711de1da1dc6a2918bb33334 Mon Sep 17 00:00:00 2001
From: Stanley Dimant <stanley.dimant@varian.com>
Date: Wed, 15 Mar 2023 10:14:05 +0100
Subject: [PATCH] fix initial cache creation

---
 MareSynchronos/MareSynchronos.csproj           |  2 +-
 .../Services/CacheCreationService.cs           | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index 25cf3bb..7db4f1b 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>0.8.4</Version>
+    <Version>0.8.5</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>
diff --git a/MareSynchronos/PlayerData/Services/CacheCreationService.cs b/MareSynchronos/PlayerData/Services/CacheCreationService.cs
index c8d040e..0d5c55d 100644
--- a/MareSynchronos/PlayerData/Services/CacheCreationService.cs
+++ b/MareSynchronos/PlayerData/Services/CacheCreationService.cs
@@ -24,15 +24,6 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
     {
         _characterDataFactory = characterDataFactory;
 
-        _playerRelatedObjects[ObjectKind.Player] =
-            gameObjectHandlerFactory(ObjectKind.Player, () => dalamudUtil.PlayerPointer, true);
-        _playerRelatedObjects[ObjectKind.MinionOrMount] =
-            gameObjectHandlerFactory(ObjectKind.Player, () => dalamudUtil.GetMinionOrMount(), true);
-        _playerRelatedObjects[ObjectKind.Pet] =
-            gameObjectHandlerFactory(ObjectKind.Pet, () => dalamudUtil.GetPet(), true);
-        _playerRelatedObjects[ObjectKind.Companion] =
-            gameObjectHandlerFactory(ObjectKind.Companion, () => dalamudUtil.GetCompanion(), true);
-
         Mediator.Subscribe<CreateCacheForObjectMessage>(this, (msg) =>
         {
             Logger.LogDebug("Received CreateCacheForObject for {handler}, updating player", msg.ObjectToCreateFor);
@@ -75,6 +66,15 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
             Logger.LogDebug("Received Penumbra Mod settings change, updating player");
             await AddPlayerCacheToCreate().ConfigureAwait(false);
         });
+
+        _playerRelatedObjects[ObjectKind.Player] =
+            gameObjectHandlerFactory(ObjectKind.Player, () => dalamudUtil.PlayerPointer, true);
+        _playerRelatedObjects[ObjectKind.MinionOrMount] =
+            gameObjectHandlerFactory(ObjectKind.Player, () => dalamudUtil.GetMinionOrMount(), true);
+        _playerRelatedObjects[ObjectKind.Pet] =
+            gameObjectHandlerFactory(ObjectKind.Pet, () => dalamudUtil.GetPet(), true);
+        _playerRelatedObjects[ObjectKind.Companion] =
+            gameObjectHandlerFactory(ObjectKind.Companion, () => dalamudUtil.GetCompanion(), true);
     }
 
     protected override void Dispose(bool disposing)