h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-03 15:50:04 +08:00
Code Issues Releases Wiki Activity

Don't use is for null-checks

Browse Source
This commit is contained in:
Dan Balasescu
2025-03-12 17:07:23 +09:00
Unverified
parent 338328b911
commit aeb55ee25d
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+16 -10
View File
@@ -526,19 +526,19 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
/// <summary>
/// Responds to changes in <see cref="SelectedItem"/> to validate the user style and update the global gameplay state.
/// </summary>
private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem?> e)
private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem?> item)
{
if (e.NewValue is not PlaylistItem item)
if (item.NewValue == null)
return;
// Always resetting the user beatmap style when a new item is selected is most intuitive.
UserBeatmap.Value = null;
if (item.Freestyle)
if (item.NewValue.Freestyle)
{
// If freestyle is active, attempt to preserve the user ruleset style but only if the online item is from the osu! ruleset
// (i.e. the beatmap is generally always convertible to the current ruleset, excluding custom rulesets).
if (item.RulesetID > 0)
if (item.NewValue.RulesetID > 0)
UserRuleset.Value = null;
}
else
@@ -554,9 +554,11 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
/// </summary>
private Mod[] listAllowedMods()
{
if (SelectedItem.Value is not PlaylistItem item)
if (SelectedItem.Value == null)
return [];
PlaylistItem item = SelectedItem.Value;
RulesetInfo gameplayRuleset = UserRuleset.Value ?? rulesets.GetRuleset(item.RulesetID)!;
Ruleset rulesetInstance = gameplayRuleset.CreateInstance();
@@ -580,9 +582,11 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
/// </summary>
private void updateGameplayState()
{
if (!this.IsCurrentScreen() || SelectedItem.Value is not PlaylistItem item)
if (!this.IsCurrentScreen() || SelectedItem.Value == null)
return;
PlaylistItem item = SelectedItem.Value;
IBeatmapInfo gameplayBeatmap = UserBeatmap.Value ?? item.Beatmap;
RulesetInfo gameplayRuleset = UserRuleset.Value ?? rulesets.GetRuleset(item.RulesetID)!;
Ruleset rulesetInstance = gameplayRuleset.CreateInstance();
@@ -638,9 +642,11 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
/// </summary>
private void startPlay()
{
if (!this.IsCurrentScreen() || SelectedItem.Value is not PlaylistItem item)
if (!this.IsCurrentScreen() || SelectedItem.Value == null)
return;
PlaylistItem item = SelectedItem.Value;
// Required for validation inside the player.
RulesetInfo gameplayRuleset = UserRuleset.Value ?? rulesets.GetRuleset(item.RulesetID)!;
IBeatmapInfo gameplayBeatmap = UserBeatmap.Value ?? item.Beatmap;
@@ -661,7 +667,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
/// </summary>
private void showUserModSelect()
{
if (!this.IsCurrentScreen() || SelectedItem.Value is not PlaylistItem)
if (!this.IsCurrentScreen() || SelectedItem.Value == null)
return;
userModsSelectOverlay.Show();
@@ -672,10 +678,10 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
/// </summary>
private void showUserStyleSelect()
{
if (!this.IsCurrentScreen() || SelectedItem.Value is not PlaylistItem item)
if (!this.IsCurrentScreen() || SelectedItem.Value == null)
return;
this.Push(new PlaylistsRoomFreestyleSelect(room, item)
this.Push(new PlaylistsRoomFreestyleSelect(room, SelectedItem.Value)
{
Beatmap = { BindTarget = UserBeatmap },
Ruleset = { BindTarget = UserRuleset }