regression: fix missing entities (SubnauticaNitrox#2675)

Measurity · web-flow · commit d2cf3c6a9cd6 · 2026-03-04T18:00:34.000+01:00
diff --git a/Nitrox.Server.Subnautica/Extensions/ServiceCollectionExtensions.cs b/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>()
diff --git a/Nitrox.Server.Subnautica/Models/Serialization/BatchCellsParser.cs b/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");
 
diff --git a/Nitrox.Server.Subnautica/Program.cs b/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>()
diff --git a/Nitrox.Server.Subnautica/Services/StatusService.cs b/Nitrox.Server.Subnautica/Services/StatusService.cs
@@ -56,36 +56,33 @@ public async Task StartedAsync(CancellationToken cancellationToken)
 
         async Task LogIps()
         {
-            // Capture and log so that logs are written in one go. This prevents different log lines being inserted in-between.
-            string logMessage;
-            using (CaptureScope captureScope = logger.BeginCaptureScope())
+            // Note: Do not use capture scope here because no redaction happens in captured logs.
+            /* TODO: Find a way to group logs and output in one go so that unrelated logs aren't in-between.
+             * Need to implement this by buffering ZLoggerEntry in a queue and writing once signaled (e.g. log scope gets disposed)
+             */
+            using (logger.BeginPlainScope())
             {
-                using (logger.BeginPlainScope())
+                logger.ZLogInformation($"Use IP to connect:");
+                using (logger.BeginPrefixScope("\t"))
                 {
-                    logger.ZLogInformation($"Use IP to connect:");
-                    using (logger.BeginPrefixScope("\t"))
+                    logger.ZLogInformation($"{IPAddress.Loopback} - You (Local)");
+                    foreach ((IPAddress address, NetHelper.MachineIpOrigin origin, string? networkName) in await NetHelper.GetAllKnownIpsAsync())
                     {
-                        logger.ZLogInformation($"{IPAddress.Loopback} - You (Local)");
-                        foreach ((IPAddress address, NetHelper.MachineIpOrigin origin, string? networkName) in await NetHelper.GetAllKnownIpsAsync())
+                        switch (origin)
                         {
-                            switch (origin)
-                            {
-                                case NetHelper.MachineIpOrigin.LAN:
-                                    logger.LogLanIp(address);
-                                    break;
-                                case NetHelper.MachineIpOrigin.VPN:
-                                    logger.LogVpnIp(networkName!, address);
-                                    break;
-                                case NetHelper.MachineIpOrigin.WAN:
-                                    logger.LogWanIp(address);
-                                    break;
-                            }
+                            case NetHelper.MachineIpOrigin.LAN:
+                                logger.LogLanIp(address);
+                                break;
+                            case NetHelper.MachineIpOrigin.VPN:
+                                logger.LogVpnIp(networkName!, address);
+                                break;
+                            case NetHelper.MachineIpOrigin.WAN:
+                                logger.LogWanIp(address);
+                                break;
                         }
                     }
                 }
-                logMessage = $"{string.Join("", captureScope.Logs).Trim(Environment.NewLine)}{Environment.NewLine}";
             }
-            logger.ZLogInformation($"{logMessage}");
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -106,23 +106,23 @@ public IServiceCollection AddFallback<TInterface, TFallback>() where TInterface`
`106`	`106`
`107`	`107`	`public IServiceCollection AddHostedSingletonService<T>() where T : class, IHostedService => services.AddSingleton<T>().AddHostedService(provider => provider.GetRequiredService<T>());`
`108`	`108`
`109`		`- public IServiceCollection AddNitroxOptions()`
	`109`	`+ public IServiceCollection AddNitroxOptions(ServerStartOptions startOptions)`
`110`	`110`	`{`
`111`	`111`	`services.AddOptionsWithValidateOnStart<ServerStartOptions, ServerStartOptions.Validator>()`
`112`	`112`	`.BindConfiguration("")`
`113`	`113`	`.Configure(options =>`
`114`	`114`	`{`
`115`	`115`	`if (string.IsNullOrWhiteSpace(options.GamePath))`
`116`	`116`	`{`
`117`		`- options.GamePath = NitroxUser.GamePath;`
	`117`	`+ options.GamePath = startOptions.GamePath;`
`118`	`118`	`}`
`119`	`119`	`if (string.IsNullOrWhiteSpace(options.NitroxAssetsPath))`
`120`	`120`	`{`
`121`		`- options.NitroxAssetsPath = NitroxUser.AssetsPath;`
	`121`	`+ options.NitroxAssetsPath = startOptions.NitroxAssetsPath;`
`122`	`122`	`}`
`123`	`123`	`if (string.IsNullOrWhiteSpace(options.NitroxAppDataPath))`
`124`	`124`	`{`
`125`		`- options.NitroxAppDataPath = NitroxUser.AppDataPath;`
	`125`	`+ options.NitroxAppDataPath = startOptions.NitroxAppDataPath;`
`126`	`126`	`}`
`127`	`127`	`});`
`128`	`128`	`services.AddOptionsWithValidateOnStart<SubnauticaServerOptions, SubnauticaServerOptions.Validator>()`
Original file line number	Diff line number	Diff line change
`@@ -56,36 +56,33 @@ public async Task StartedAsync(CancellationToken cancellationToken)`
`56`	`56`
`57`	`57`	`async Task LogIps()`
`58`	`58`	`{`
`59`		`- // Capture and log so that logs are written in one go. This prevents different log lines being inserted in-between.`
`60`		`- string logMessage;`
`61`		`- using (CaptureScope captureScope = logger.BeginCaptureScope())`
	`59`	`+ // Note: Do not use capture scope here because no redaction happens in captured logs.`
	`60`	`+ /* TODO: Find a way to group logs and output in one go so that unrelated logs aren't in-between.`
	`61`	`+ * Need to implement this by buffering ZLoggerEntry in a queue and writing once signaled (e.g. log scope gets disposed)`
	`62`	`+ */`
	`63`	`+ using (logger.BeginPlainScope())`
`62`	`64`	`{`
`63`		`- using (logger.BeginPlainScope())`
	`65`	`+ logger.ZLogInformation($"Use IP to connect:");`
	`66`	`+ using (logger.BeginPrefixScope("\t"))`
`64`	`67`	`{`
`65`		`- logger.ZLogInformation($"Use IP to connect:");`
`66`		`- using (logger.BeginPrefixScope("\t"))`
	`68`	`+ logger.ZLogInformation($"{IPAddress.Loopback} - You (Local)");`
	`69`	`+ foreach ((IPAddress address, NetHelper.MachineIpOrigin origin, string? networkName) in await NetHelper.GetAllKnownIpsAsync())`
`67`	`70`	`{`
`68`		`- logger.ZLogInformation($"{IPAddress.Loopback} - You (Local)");`
`69`		`- foreach ((IPAddress address, NetHelper.MachineIpOrigin origin, string? networkName) in await NetHelper.GetAllKnownIpsAsync())`
	`71`	`+ switch (origin)`
`70`	`72`	`{`
`71`		`- switch (origin)`
`72`		`- {`
`73`		`- case NetHelper.MachineIpOrigin.LAN:`
`74`		`- logger.LogLanIp(address);`
`75`		`- break;`
`76`		`- case NetHelper.MachineIpOrigin.VPN:`
`77`		`- logger.LogVpnIp(networkName!, address);`
`78`		`- break;`
`79`		`- case NetHelper.MachineIpOrigin.WAN:`
`80`		`- logger.LogWanIp(address);`
`81`		`- break;`
`82`		`- }`
	`73`	`+ case NetHelper.MachineIpOrigin.LAN:`
	`74`	`+ logger.LogLanIp(address);`
	`75`	`+ break;`
	`76`	`+ case NetHelper.MachineIpOrigin.VPN:`
	`77`	`+ logger.LogVpnIp(networkName!, address);`
	`78`	`+ break;`
	`79`	`+ case NetHelper.MachineIpOrigin.WAN:`
	`80`	`+ logger.LogWanIp(address);`
	`81`	`+ break;`
`83`	`82`	`}`
`84`	`83`	`}`
`85`	`84`	`}`
`86`		`- logMessage = $"{string.Join("", captureScope.Logs).Trim(Environment.NewLine)}{Environment.NewLine}";`
`87`	`85`	`}`
`88`		`- logger.ZLogInformation($"{logMessage}");`
`89`	`86`	`}`
`90`	`87`	`}`
`91`	`88`