Fix entities not showing if game path set via command line args

Author: Measurity

Nitrox.Server.Subnautica/Extensions/ServiceCollectionExtensions.cs

@@ -106,23 +106,23 @@ public IServiceCollection AddFallback<TInterface, TFallback>() where TInterface
 
         public IServiceCollection AddHostedSingletonService<T>() where T : class, IHostedService => services.AddSingleton<T>().AddHostedService(provider => provider.GetRequiredService<T>());
 
-        public IServiceCollection AddNitroxOptions()
+        public IServiceCollection AddNitroxOptions(ServerStartOptions startOptions)
         {
             services.AddOptionsWithValidateOnStart<ServerStartOptions, ServerStartOptions.Validator>()
                     .BindConfiguration("")
                     .Configure(options =>
                     {
                         if (string.IsNullOrWhiteSpace(options.GamePath))
                         {
-                            options.GamePath = NitroxUser.GamePath;
+                            options.GamePath = startOptions.GamePath;
                         }
                         if (string.IsNullOrWhiteSpace(options.NitroxAssetsPath))
                         {
-                            options.NitroxAssetsPath = NitroxUser.AssetsPath;
+                            options.NitroxAssetsPath = startOptions.NitroxAssetsPath;
                         }
                         if (string.IsNullOrWhiteSpace(options.NitroxAppDataPath))
                         {
-                            options.NitroxAppDataPath = NitroxUser.AppDataPath;
+                            options.NitroxAppDataPath = startOptions.NitroxAppDataPath;
                         }
                     });
             services.AddOptionsWithValidateOnStart<SubnauticaServerOptions, SubnauticaServerOptions.Validator>()

Nitrox.Server.Subnautica/Models/Serialization/BatchCellsParser.cs

@@ -40,7 +40,7 @@ public BatchCellsParser(EntitySpawnPointFactory entitySpawnPointFactory, Subnaut
 
         public List<EntitySpawnPoint> ParseBatchData(NitroxInt3 batchId)
         {
-            List<EntitySpawnPoint> spawnPoints = new List<EntitySpawnPoint>();
+            List<EntitySpawnPoint> spawnPoints = [];
 
             ParseFile(batchId, "CellsCache", "baked-", "", spawnPoints);
 
@@ -49,12 +49,6 @@ public List<EntitySpawnPoint> ParseBatchData(NitroxInt3 batchId)
 
         public void ParseFile(NitroxInt3 batchId, string pathPrefix, string prefix, string suffix, List<EntitySpawnPoint> spawnPoints)
         {
-            string subnauticaPath = NitroxUser.GamePath;
-            if (string.IsNullOrEmpty(subnauticaPath))
-            {
-                return;
-            }
-
             string path = options.Value.GetSubnauticaBuild18Path();
             string fileName = Path.Combine(path, pathPrefix, $"{prefix}batch-cells-{batchId.X}-{batchId.Y}-{batchId.Z}{suffix}.bin");
 

Nitrox.Server.Subnautica/Program.cs

@@ -91,7 +91,7 @@ private static async Task StartServerAsync(string[] args)
                    options.ServicesStartConcurrently = true;
                    options.ServicesStopConcurrently = true;
                })
-               .AddNitroxOptions()
+               .AddNitroxOptions(startOptions)
                // Add initialization services - diagnoses the server environment on startup.
                .AddHostedSingletonService<PreventMultiServerInitService>()
                .AddHostedSingletonService<NetworkPortAvailabilityService>()