Change PlayerOptions.None to avoid conflict

MatrikMoon · Apr 20, 2023 · 221b133 · 221b133
1 parent 1e7f1b2
commit 221b133
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/TournamentAssistant/PluginClient.cs b/TournamentAssistant/PluginClient.cs
@@ -156,7 +156,7 @@ async void loadSongAction(string hash, bool succeeded)
                     var playerSettings = playerData.playerSpecificSettings;
 
                     //Override defaults if we have forced options enabled
-                    if (playSong.GameplayParameters.PlayerSettings.Options != PlayerOptions.None)
+                    if (playSong.GameplayParameters.PlayerSettings.Options != PlayerOptions.NoPlayerOptions)
                     {
                         playerSettings = new PlayerSpecificSettings(
                             playSong.GameplayParameters.PlayerSettings.Options.HasFlag(PlayerOptions.LeftHanded),

diff --git a/TournamentAssistant/UI/FlowCoordinators/QualifierCoordinator.cs b/TournamentAssistant/UI/FlowCoordinators/QualifierCoordinator.cs
@@ -87,7 +87,7 @@ private void SongDetail_didPressPlayButtonEvent(IBeatmapLevel level, BeatmapChar
             var playerSettings = playerData.playerSpecificSettings;
 
             //Override defaults if we have forced options enabled
-            if (_currentParameters.PlayerSettings.Options != PlayerOptions.None)
+            if (_currentParameters.PlayerSettings.Options != PlayerOptions.NoPlayerOptions)
             {
                 playerSettings = new PlayerSpecificSettings(
                         _currentParameters.PlayerSettings.Options.HasFlag(PlayerOptions.LeftHanded),

diff --git a/TournamentAssistantCore/Discord/Modules/QualifierModule.cs b/TournamentAssistantCore/Discord/Modules/QualifierModule.cs
@@ -252,7 +252,7 @@ public async Task AddSongAsync(string eventId, string songId, BeatmapDifficulty
 
             var playerOptions = Enum.GetValues(typeof(PlayerOptions)).Cast<PlayerOptions>()
                 .Where(o => !string.IsNullOrWhiteSpace(playerOptionsString.ParseArgs(o.ToString())))
-                .Aggregate(PlayerOptions.None, (current, o) => current | o);
+                .Aggregate(PlayerOptions.NoPlayerOptions, (current, o) => current | o);
 
             //Sanitize input
             songId = SanitizeSongId(songId);
@@ -374,7 +374,7 @@ public async Task AddSongAsync(string eventId, string songId, BeatmapDifficulty
 
                         await ModifyOriginalResponseAsync(x => x.Embed = (replyString +
                                                  $"{(gameOptions != GameOptions.None ? $" with game options: ({gameOptions})" : "")}" +
-                                                 $"{(playerOptions != PlayerOptions.None ? $" with player options: ({playerOptions})" : "!")}").SuccessEmbed());
+                                                 $"{(playerOptions != PlayerOptions.NoPlayerOptions ? $" with player options: ({playerOptions})" : "!")}").SuccessEmbed());
                         break;
                     case Response.ResponseType.Fail:
                         await ModifyOriginalResponseAsync(x => x.Embed = response.modify_qualifier.Message.ErrorEmbed());
@@ -489,7 +489,7 @@ public async Task RemoveSongAsync(string eventId, string songId, BeatmapDifficul
 
                 var playerOptions = Enum.GetValues(typeof(PlayerOptions)).Cast<PlayerOptions>()
                     .Where(o => !string.IsNullOrWhiteSpace(playerOptionsString.ParseArgs(o.ToString())))
-                    .Aggregate(PlayerOptions.None, (current, o) => current | o);
+                    .Aggregate(PlayerOptions.NoPlayerOptions, (current, o) => current | o);
 
                 //Sanitize input
                 songId = SanitizeSongId(songId);
@@ -516,7 +516,7 @@ public async Task RemoveSongAsync(string eventId, string songId, BeatmapDifficul
                         case Response.ResponseType.Success:
                             await ModifyOriginalResponseAsync(x => x.Embed = ($"Removed {song.Beatmap.Name} ({difficulty}) ({characteristic}) from the song list" +
                                                      $"{(gameOptions != GameOptions.None ? $" with game options: ({gameOptions})" : "")}" +
-                                                     $"{(playerOptions != PlayerOptions.None ? $" with player options: ({playerOptions})" : "!")}").SuccessEmbed());
+                                                     $"{(playerOptions != PlayerOptions.NoPlayerOptions ? $" with player options: ({playerOptions})" : "!")}").SuccessEmbed());
                             break;
                         case Response.ResponseType.Fail:
                             await ModifyOriginalResponseAsync(x => x.Embed = response.modify_qualifier.Message.ErrorEmbed());

diff --git a/TournamentAssistantProtos b/TournamentAssistantProtos