Allow Quit to Main Menu by MistaOmega · Pull Request #2659 · SubnauticaNitrox/Nitrox

MistaOmega · 2026-01-25T19:32:41Z

Draft whilst I keep looking for bugs and broken stuff that has come from this

added some event cleanups for PlayerCinematics.cs and StoryGoalInitialSyncProcessor.cs removed application.quit from IngameMenu_QuitGame_Patch.cs

- Properly unhook events for multiplayer session lifecycle. - Add `OnSessionEnd` handling to session-scoped behaviours for automatic cleanup. - Clear registries and caches on session end. - Fix issues w/ stale references in service lifetimes.

github-actions · 2026-01-25T19:34:17Z

Test Results

251 tests +11 250 ✅ +11 8s ⏱️ ±0s
1 suites ± 0 1 💤 ± 0
1 files ± 0 0 ❌ ± 0

Results for commit 8882e18. ± Comparison against base commit b98858a.

This pull request removes 2 and adds 13 tests. Note that renamed tests count towards both.

Nitrox.Model.Packets.Processors.PacketProcessorTest ‑ SameAmountOfServerPacketProcessors
Nitrox.Test.Server.Helper.XORRandomTest ‑ TestMeanGeneration

Nitrox.Model.DataStructures.NitroxIdTest ‑ CompareToReturnsOneForNull
Nitrox.Model.DataStructures.NitroxIdTest ‑ CompareToReturnsZeroForEqualIds
Nitrox.Model.DataStructures.NitroxIdTest ‑ CompareToUsesUnderlyingGuidOrdering
Nitrox.Model.DataStructures.NitroxIdTest ‑ DifferentGuidEquality
Nitrox.Model.DataStructures.NitroxIdTest ‑ EqualIdsHaveSameHashCode
Nitrox.Model.DataStructures.NitroxIdTest ‑ EqualsObjectReturnsFalseForDifferentType
Nitrox.Model.DataStructures.NitroxIdTest ‑ IncrementAdvancesId
Nitrox.Model.DataStructures.NitroxIdTest ‑ IncrementWrapsAroundFromMaxValue
Nitrox.Model.DataStructures.NitroxIdTest ‑ SameReferenceEquality
Nitrox.Server.Subnautica.Models.GameLogic.Entities.SubnauticaUwePrefabFactoryTest ‑ TryGetPossiblePrefabsAsync_ConcurrentCallsSameBiome_LoadsDistributionOnce
…

♻️ This comment has been updated with latest results.

MistaOmega · 2026-01-25T19:48:36Z

Cleanups are as follows at the moment:

Non-destroyed Monos

components added in Multiplayer.InitMonoBehaviours():

UnderwaterStateTracker
PrecursorTracker
PlayerMovementBroadcaster
PlayerDeathBroadcaster
PlayerStatsBroadcaster
EntityPositionBroadcaster
BuildingHandler
MovementBroadcaster

Static Collections

NitroxEntity.gameObjectsById
EntityPositionBroadcaster.watchingEntityIds / splineUpdatesById
VirtualCyclops.cacheColliderCopy
CyclopsPawn.controllers

Lambda Event Subs

StoryGoalInitialSyncProcessor.cs:155: Multiplayer.OnLoadingComplete += () => ...
PlayerCinematics.cs:71: Multiplayer.OnLoadingComplete += () => ...

Couple Singletons with State

BuildingHandler.Main - holds queues and operations
MovementBroadcaster.Instance - holds replicator dictionary

Random Stuff I've Tested

Leave Server 1, Join Server 2: Good, no shared state, pos, stats, etc.
Leave and rejoin piloting cyclops: bugged (fixed)
Leave and rejoin inside cyclops: good
Leave and rejoin in seamoth: good
Leave and rejoin, have story event play: both synced
Leave and rejoin and build base pieces: good
Leave and rejoin a base built prior: good
Leave and rejoin within a base: good

Bug Tracking

Cyclops Rejoin Handling

Be driving the cyclops, leave and rejoin
Throws NPE within CyclopsPawn
Due to the Controllers not being cleared
Sln: Write designated cleanup code into VirtualCyclops.cs

)

…de) (SubnauticaNitrox#2661)

…trox#2644) Co-authored-by: dartasen <10561268+dartasen@users.noreply.github.com>

This caused proton to be launched without a proper Steam exe.

…2664)

…Nitrox#2665)

Co-authored-by: Coding-Hen <8798074+Coding-Hen@users.noreply.github.com>

…auticaNitrox#2653)

SubnauticaNitrox#2669)

…itrox#2628)

Previously this caused user to require deleting the cache file in order to start the server successfully.

Co-authored-by: misterbubb <106004257+misterbubb@users.noreply.github.com>

Model -> Nitrox.Model

…auticaNitrox#2693) Co-authored-by: dartasen <10561268+dartasen@users.noreply.github.com>

Co-authored-by: Meas <1107063+Measurity@users.noreply.github.com>

…bnauticaNitrox#2701) Co-authored-by: Meas <1107063+Measurity@users.noreply.github.com>

Jannify · 2026-03-30T00:14:07Z

 namespace NitroxClient.MonoBehaviours;

-public class PlayerMovementBroadcaster : MonoBehaviour
+public class PlayerMovementBroadcaster : NitroxSessionBehaviour


Do we need NitroxSessionBehaviour if don't implement OnSessionEnd()?

Jannify · 2026-04-05T22:13:44Z

+            NitroxEntity.ClearAll();
+
+            // clear remote players
+            PlayerManager remotePlayerManager = NitroxServiceLocator.LocateService<PlayerManager>();


Suggested change

PlayerManager remotePlayerManager = NitroxServiceLocator.LocateService<PlayerManager>();

PlayerManager remotePlayerManager = Resolve<PlayerManager>();

I can't seem to call resolve in a static context. So I think current impl is the best currently

MistaOmega · 2026-04-06T20:55:50Z

Seen these, will work through soon <3

…auticaNitrox#2702)

…uticaNitrox#2706)

added some event cleanups for PlayerCinematics.cs and StoryGoalInitialSyncProcessor.cs removed application.quit from IngameMenu_QuitGame_Patch.cs

- Properly unhook events for multiplayer session lifecycle. - Add `OnSessionEnd` handling to session-scoped behaviours for automatic cleanup. - Clear registries and caches on session end. - Fix issues w/ stale references in service lifetimes.

# Conflicts: # NitroxClient/GameLogic/PlayerManager.cs

…player.cs

MistaOmega added 2 commits January 25, 2026 00:34

base method for monobehaviours (to impl)

2cbf209

added some event cleanups for PlayerCinematics.cs and StoryGoalInitialSyncProcessor.cs removed application.quit from IngameMenu_QuitGame_Patch.cs

fix(movement): clear pawn controllers

9130257

MistaOmega marked this pull request as ready for review January 27, 2026 20:43

weblate and others added 24 commits January 30, 2026 14:17

[Weblate] Translations update from Hosted Weblate (SubnauticaNitrox#2660

8dd2b1f

)

Enabled CRC for packets and use native sockets (latter only server-si…

bde6d8f

…de) (SubnauticaNitrox#2661)

Sync DataBox (BlueprintHandTarget) state across players (SubnauticaNi…

3f06268

…trox#2644) Co-authored-by: dartasen <10561268+dartasen@users.noreply.github.com>

Improved Steam exe finding in launcher for Linux

0d1fa0c

This caused proton to be launched without a proper Steam exe.

Added code comment to SteamFinder explaining OSX special case

4830234

Fixed Steam exe not found for some setups on Linux (SubnauticaNitrox#…

13e8037

…2664)

Fixed prefab resource cache not storing all required data (Subnautica…

b00d567

…Nitrox#2665)

Asyncify command and packet handling (SubnauticaNitrox#2656)

fbd5caf

Co-authored-by: Coding-Hen <8798074+Coding-Hen@users.noreply.github.com>

Fix Sea Emperor hatching sequence not completing in multiplayer (Subn…

d9be49c

…auticaNitrox#2653)

regression: server sleep (aka no players connected) not causing a save (

2ee1972

SubnauticaNitrox#2669)

Upgrade LiteNetLib

9b90ae3

Fixed NRE at BatchEntitySpawner.parsedBatches

601babf

Upgrade LiteNetLib to 1.3.5 (SubnauticaNitrox#2670)

8ad385b

Fixed server output selection not copying text on ctrl+c

9b4c591

Fixed launcher player count in UI not updating on server stop

1b47598

Fixed url-tagged text not aligning with normal text in RichTextBlock

094db8e

Fixed auto scroll always scrolling to the bottom

a3342d0

Fixed string handler command being called if no args are passed

d767d9f

Fixed server output selection not copying text on ctrl+c (SubnauticaN…

32e9449

…itrox#2628)

Code readability improvements

0b2713c

Fixed prefab cache version not being checked

2e5febf

Previously this caused user to require deleting the cache file in order to start the server successfully.

regression: fix prefab cache version check (SubnauticaNitrox#2674)

fe5ef53

Sync PrecursorDisableGunTerminal firstUse state (SubnauticaNitrox#2647)

9fbf9e8

Re-do the "restart" command (SubnauticaNitrox#2594)

f5ab747

Co-authored-by: misterbubb <106004257+misterbubb@users.noreply.github.com>

Measurity and others added 13 commits March 28, 2026 02:35

Handled nullability in NitroxEntityExtensions.cs

a09632b

Changed NitroxUser to use new "field" keyword in properties

647b77c

Fixed code doc ref in NitroxInt3.cs

be6a6ad

Model -> Nitrox.Model

Changed IAdminFeature<T> to match behavior of IOptions<T>

f837658

Removed unused packetSender field in PlayerInCyclopsMovementProcessor

b73a885

Removed unused Player.PlayerSettings property

f37fc2a

Fix change detection on server config files (SubnauticaNitrox#2680)

42ecc53

Fix cache stampede in SubnauticaUwePrefabFactory (SubnauticaNitrox#2694)

f7ab432

Disabled CET (SubnauticaNitrox#2697)

19f2c80

[MacOS] Implement SetForegroundWindowAndRestore using Osascript (Subn…

f00e248

…auticaNitrox#2693) Co-authored-by: dartasen <10561268+dartasen@users.noreply.github.com>

Fix Query Command (SubnauticaNitrox#2700)

11e206e

Co-authored-by: Meas <1107063+Measurity@users.noreply.github.com>

Added player list tooltip to Nitrox Launcher (SubnauticaNitrox#2699)

bddbc2f

Fix duplicated simulation state text inside NitroxEntity Debugger (Su…

d9e05d9

…bnauticaNitrox#2701) Co-authored-by: Meas <1107063+Measurity@users.noreply.github.com>

Jannify requested changes Apr 5, 2026

View reviewed changes

Improve PrefabPlaceHolder cache handling (SubnauticaNitrox#2704)

6642654

dartasen and others added 3 commits April 6, 2026 22:59

[Launcher] Migrate to partial properties for ObservableProperty (Subn…

11ea965

…auticaNitrox#2702)

Ignored dispose error thrown when connection is already closed (Subna…

93b4062

…uticaNitrox#2706)

Fix windows not being draggable (SubnauticaNitrox#2703)

ba56d9a

This comment was marked as spam.

Sign in to view

MistaOmega added 6 commits April 18, 2026 11:23

base method for monobehaviours (to impl)

241241e

added some event cleanups for PlayerCinematics.cs and StoryGoalInitialSyncProcessor.cs removed application.quit from IngameMenu_QuitGame_Patch.cs

fix(movement): clear pawn controllers

77a0ce7

Merge remote-tracking branch 'origin/2545/quit_game' into 2545/quit_game

cb40815

# Conflicts: # NitroxClient/GameLogic/PlayerManager.cs

Use sessionId on PlayerManager.cs to remove players

4e8e4a0

Review comments for SubnauticaNitrox#2659

763db38

MistaOmega requested review from Coding-Hen and Jannify April 18, 2026 10:57

Use cache to get player manager for setting loading complete in Multi…

8882e18

…player.cs

dartasen added the Status: Waiting for reviews Pull Request is waiting for code review label May 18, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow Quit to Main Menu#2659

Allow Quit to Main Menu#2659
MistaOmega wants to merge 67 commits into
SubnauticaNitrox:masterfrom
MistaOmega:2545/quit_game

MistaOmega commented Jan 25, 2026

Uh oh!

github-actions Bot commented Jan 25, 2026 •

edited

Loading

Uh oh!

MistaOmega commented Jan 25, 2026 •

edited

Loading

Uh oh!

Jannify Mar 30, 2026

Uh oh!

Jannify Apr 5, 2026

Uh oh!

MistaOmega Apr 18, 2026

Uh oh!

MistaOmega commented Apr 6, 2026

Uh oh!

This comment was marked as spam.

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

	PlayerManager remotePlayerManager = NitroxServiceLocator.LocateService<PlayerManager>();
	PlayerManager remotePlayerManager = Resolve<PlayerManager>();

Conversation

MistaOmega commented Jan 25, 2026

Uh oh!

github-actions Bot commented Jan 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

MistaOmega commented Jan 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Non-destroyed Monos

Static Collections

Lambda Event Subs

Couple Singletons with State

Random Stuff I've Tested

Bug Tracking

Uh oh!

Jannify Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Jannify Apr 5, 2026

Choose a reason for hiding this comment

Uh oh!

MistaOmega Apr 18, 2026

Choose a reason for hiding this comment

Uh oh!

MistaOmega commented Apr 6, 2026

Uh oh!

This comment was marked as spam.

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

github-actions Bot commented Jan 25, 2026 •

edited

Loading

MistaOmega commented Jan 25, 2026 •

edited

Loading