fix: Fixes after testing

Author: kirre-bylund

Runtime/Client/LootLockerLifecycleManager.cs

@@ -11,6 +11,11 @@ namespace LootLocker
     /// </summary>
     public enum LifecycleManagerState
     {
+        /// <summary>
+        /// Manager is not initialized or has been destroyed - can be recreated
+        /// </summary>
+        Uninitialized,
+        
         /// <summary>
         /// Normal operation - services can be accessed and managed
         /// </summary>
@@ -132,6 +137,9 @@ private static void TeardownInstance()
                     _instanceId = 0;
                     _hostingGameObject = null;
                 }
+                
+                // Set to Uninitialized after teardown to allow recreation
+                _state = LifecycleManagerState.Uninitialized;
             }
         }
 
@@ -180,7 +188,7 @@ static void OnEnterPlaymodeInEditor(UnityEditor.EnterPlayModeOptions options)
         private bool _isInitialized = false;
         private bool _serviceHealthMonitoringEnabled = true;
         private Coroutine _healthMonitorCoroutine = null;
-        private static LifecycleManagerState _state = LifecycleManagerState.Ready;
+        private static LifecycleManagerState _state = LifecycleManagerState.Uninitialized;
         private readonly object _serviceLock = new object();
 
         /// <summary>

Runtime/Client/LootLockerPresenceManager.cs

@@ -109,6 +109,12 @@ public static IEnumerable<string> ActiveClientUlids
         /// </summary>
         public static LootLockerPresenceManager Get()
         {
+            // During Unity shutdown, don't create new instances
+            if (!Application.isPlaying)
+            {
+                return _instance;
+            }
+
             if (_instance != null)
             {
                 return _instance;
@@ -173,7 +179,10 @@ public void SetEventSystem(LootLockerEventSystem eventSystemInstance)
 
         void ILootLockerService.Reset()
         {
-            _DestroyAllClients();
+            if (!_isShuttingDown)
+            {
+                _DestroyAllClients();
+            }
 
             _UnsubscribeFromEvents();
 
@@ -221,11 +230,14 @@ void ILootLockerService.HandleApplicationFocus(bool hasFocus)
 
         void ILootLockerService.HandleApplicationQuit()
         {
-            _isShuttingDown = true;
-            
-            _UnsubscribeFromEvents();
-            _DestroyAllClients();
-            _connectedSessions?.Clear();
+            if (!_isShuttingDown)
+            {
+                _isShuttingDown = true;
+                
+                _UnsubscribeFromEvents();
+                _DestroyAllClients();
+                _connectedSessions?.Clear();
+            }
         }
 
         #endregion
@@ -814,6 +826,12 @@ public static bool IsPresenceConnected(string playerUlid = null)
         /// </summary>
         public static LootLockerPresenceConnectionStats GetPresenceConnectionStats(string playerUlid = null)
         {
+            // Return empty stats during shutdown to prevent service access
+            if (!Application.isPlaying)
+            {
+                return new LootLockerPresenceConnectionStats();
+            }
+
             var instance = Get();
             if (instance == null) return new LootLockerPresenceConnectionStats();
 
@@ -953,7 +971,14 @@ private void _DestroyAllClients()
                 _connectingClients.Clear();
             }
 
-            // Destroy all clients outside the lock
+            // During Unity shutdown, don't destroy objects manually to avoid conflicts with LifecycleManager
+            if (!Application.isPlaying || _isShuttingDown)
+            {
+                // Just clear the collections, let Unity handle object destruction during shutdown
+                return;
+            }
+
+            // Destroy all clients outside the lock (only during normal operation)
             foreach (var client in clientsToDestroy)
             {
                 if (client != null)
@@ -1353,14 +1378,22 @@ private LootLockerPresenceClient _GetPresenceClientForUlid(string playerUlid)
 
         private void OnDestroy()
         {
+            // During Unity shutdown, avoid any complex operations
+            if (!Application.isPlaying)
+            {
+                return;
+            }
+
             if (!_isShuttingDown)
             {
                 _isShuttingDown = true;
                 _UnsubscribeFromEvents();
 
+                // Only destroy clients if we're not in Unity shutdown
                 _DestroyAllClients();
             }
 
+            // Skip lifecycle manager operations during shutdown
             if(!LootLockerLifecycleManager.IsReady) return;
 
             // Only unregister if the LifecycleManager exists and we're actually registered