Fixed vehicle services scopes

UncreatedStaff · Dec 11, 2024 · 16c1292 · 16c1292
1 parent 3bf3c3f
commit 16c1292
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/UncreatedWarfare/Vehicles/Spawners/VehicleSpawnerStore.cs b/UncreatedWarfare/Vehicles/Spawners/VehicleSpawnerStore.cs
@@ -28,7 +28,7 @@ namespace Uncreated.Warfare.Vehicles;
 /// <remarks>Decided to go with raw binary instead of SQL since this kind of relies on other level savedata and the map, plus it was easier.</remarks>
 
 [Priority(-1 /* load after BuildableSaver and VehicleInfoStore */)]
-public class VehicleSpawnerStore : ILayoutHostedService
+public class VehicleSpawnerStore : ILayoutHostedService, IDisposable
 {
     private YamlDataStore<List<VehicleSpawnInfo>> _dataStore;
     private readonly WarfareModule _warfare;
@@ -56,31 +56,16 @@ public VehicleSpawnerStore(WarfareModule warfare, IConfiguration configuration,
 
     UniTask ILayoutHostedService.StartAsync(CancellationToken token)
     {
-        if (Level.isLoaded)
-        {
-            OnLevelLoaded(Level.BUILD_INDEX_GAME);
-        }
-        else
-        {
-            Level.onLevelLoaded += OnLevelLoaded;
-        }
-
+        ReloadSpawners();
         return UniTask.CompletedTask;
     }
 
     UniTask ILayoutHostedService.StopAsync(CancellationToken token)
     {
-        Level.onLevelLoaded -= OnLevelLoaded;
-        _dataStore?.Dispose();
         return UniTask.CompletedTask;
     }
-    private void OnLevelLoaded(int level)
+    private void ReloadSpawners()
     {
-        if (level != Level.BUILD_INDEX_GAME)
-            return;
-
-        Level.onLevelLoaded -= OnLevelLoaded;
-
         _dataStore.Reload();
         OnSpawnsReloaded?.Invoke();
     }
@@ -144,4 +129,9 @@ public async UniTask SaveAsync(CancellationToken token = default)
 
         _dataStore.Save(); // todo: make an async Save() function
     }
+
+    public void Dispose()
+    {
+        _dataStore.Dispose();
+    }
 }
diff --git a/UncreatedWarfare/WarfareModule.cs b/UncreatedWarfare/WarfareModule.cs
@@ -519,11 +519,11 @@ private void ConfigureServices(ContainerBuilder bldr)
 
         bldr.RegisterType<VehicleRequestService>()
             .AsImplementedInterfaces().AsSelf()
-            .InstancePerMatchingLifetimeScope(LifetimeScopeTags.Session);
-        
+            .SingleInstance();
+
         bldr.RegisterType<VehicleSpawnerStore>()
             .AsImplementedInterfaces().AsSelf()
-            .InstancePerMatchingLifetimeScope(LifetimeScopeTags.Session);
+            .SingleInstance();
 
         bldr.RegisterType<VehicleSpawnerService>()
             .AsImplementedInterfaces().AsSelf()