Add matchmaking model types required for server-side deploy #34912
Conversation
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
|
Actually before this goes in (since we're going to need a nuget package), let's add a variant to |
diff --git a/osu.Game/Online/Matchmaking/MatchmakingSettings.cs b/osu.Game/Online/Matchmaking/MatchmakingSettings.cs
index 050133e192..c1a10e97ad 100644
--- a/osu.Game/Online/Matchmaking/MatchmakingSettings.cs
+++ b/osu.Game/Online/Matchmaking/MatchmakingSettings.cs
@@ -14,16 +14,18 @@ public class MatchmakingSettings : IEquatable<MatchmakingSettings>
[Key(0)]
public int RulesetId { get; set; }
+ [Key(1)]
+ public int Variant { get; set; }
+
public bool Equals(MatchmakingSettings? other)
- => other != null && RulesetId == other.RulesetId;
+ => other != null
+ && RulesetId == other.RulesetId
+ && Variant == other.Variant;
public override bool Equals(object? obj)
=> obj is MatchmakingSettings other && Equals(other);
[SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")]
- public override int GetHashCode()
- {
- return RulesetId;
- }
+ public override int GetHashCode() => HashCode.Combine(RulesetId, Variant);
}
}
|
2 tasks
This was referenced Sep 5, 2025
This was referenced Oct 3, 2025
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.
Split out from #34815 to get server-side things deployed.
Should be a clean diff against
matchmakingmain branch with no surprises.