init 2

LightlessSync/PlayerData/Services/CacheCreationService.cs

@@ -20,6 +20,7 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
     private readonly CancellationTokenSource _runtimeCts = new();
     private CancellationTokenSource _creationCts = new();
     private CancellationTokenSource _debounceCts = new();
+    private string? _lastPublishedHash;
     private bool _haltCharaDataCreation;
     private bool _isZoning = false;
 
@@ -183,7 +184,18 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
     {
         if (_isZoning || _haltCharaDataCreation) return;
 
-        if (_cachesToCreate.Count == 0) return;
+        bool hasCaches;
+        _cacheCreateLock.Wait();
+        try
+        {
+            hasCaches = _cachesToCreate.Count > 0;
+        }
+        finally
+        {
+            _cacheCreateLock.Release();
+        }
+
+        if (!hasCaches) return;
 
         if (_playerRelatedObjects.Any(p => p.Value.CurrentDrawCondition is
             not (GameObjectHandler.DrawCondition.None or GameObjectHandler.DrawCondition.DrawObjectZero or GameObjectHandler.DrawCondition.ObjectZero)))
@@ -197,6 +209,11 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
         _creationCts = new();
         _cacheCreateLock.Wait(_creationCts.Token);
         var objectKindsToCreate = _cachesToCreate.ToList();
+        if (objectKindsToCreate.Count == 0)
+        {
+            _cacheCreateLock.Release();
+            return;
+        }
         foreach (var creationObj in objectKindsToCreate)
         {
             _currentlyCreating.Add(creationObj);
@@ -225,8 +242,17 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
                     _playerData.SetFragment(kvp.Key, kvp.Value);
                 }
 
-                Mediator.Publish(new CharacterDataCreatedMessage(_playerData.ToAPI()));
-                _currentlyCreating.Clear();
+                var apiData = _playerData.ToAPI();
+                var currentHash = apiData.DataHash.Value;
+                if (string.Equals(_lastPublishedHash, currentHash, StringComparison.Ordinal))
+                {
+                    Logger.LogTrace("Cache creation produced identical character data ({hash}), skipping publish.", currentHash);
+                }
+                else
+                {
+                    _lastPublishedHash = currentHash;
+                    Mediator.Publish(new CharacterDataCreatedMessage(apiData));
+                }
             }
             catch (OperationCanceledException)
             {
@@ -238,6 +264,7 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
             }
             finally
             {
+                _currentlyCreating.Clear();
                 Logger.LogDebug("Cache Creation complete");
             }
         });