fix: improve null safety in ReadySystem, MatchManager, and MatchUtility#135
Merged
fix: improve null safety in ReadySystem, MatchManager, and MatchUtility#135
Conversation
- ReadySystem.SendReadyMessage: use TryGetValue instead of direct dictionary access to prevent KeyNotFoundException on reconnect - MatchManager.GetCurrentMap: capture _matchData in local variable before lambda to prevent race condition if field becomes null - MatchUtility.GetPlayerLineupTag: use string.IsNullOrEmpty() instead of manual null/empty check Closes 5stackgg/5stack-panel#399
lukepolo
reviewed
Mar 31, 2026
| bool isReady = _readyPlayers[player.UserId.Value]; | ||
| if (!_readyPlayers.TryGetValue(player.UserId.Value, out bool isReady)) | ||
| { | ||
| return; |
Per review: if player isn't in the dictionary, TryGetValue defaults isReady to false, so they'll see the "not ready" message.
Contributor
Author
|
Good call — now if the player isn't in the dictionary, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
TryGetValueinstead of direct dictionary indexer to preventKeyNotFoundExceptionwhen a player reconnects and isn't yet in_readyPlayers_matchDatain a local variable before passing to lambda, preventing a race condition if the field becomes null between the null check and lambda executiontag == null || tag == ""with idiomaticstring.IsNullOrEmpty(tag)Test plan
Closes 5stackgg/5stack-panel#399