Should not validate the object in here because status should be valid…

… after re-assign the value in the beatmap processor.
karaoke-dev · Mar 26, 2023 · 4cef74e · 4cef74e
1 parent bd55c98
commit 4cef74e
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmapProcessor.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmapProcessor.cs
@@ -36,7 +36,6 @@ private void applyInvalidProperty(IBeatmap beatmap)
                         foreach (var flag in lyric.WorkingPropertyValidator.GetAllInvalidFlags())
                         {
                             applyInvalidProperty(lyric, flag);
-                            lyric.WorkingPropertyValidator.Validate(flag);
                         }
 
                         break;
@@ -45,7 +44,6 @@ private void applyInvalidProperty(IBeatmap beatmap)
                         foreach (var flag in note.WorkingPropertyValidator.GetAllInvalidFlags())
                         {
                             applyInvalidProperty(note, flag);
-                            note.WorkingPropertyValidator.Validate(flag);
                         }
 
                         break;
@@ -63,10 +61,7 @@ private void applyInvalidProperty(Lyric lyric, LyricWorkingProperty flag)
                     break;
 
                 case LyricWorkingProperty.ReferenceLyric:
-                    if (lyric.ReferenceLyric != null || lyric.ReferenceLyricId == null)
-                        return;
-
-                    lyric.ReferenceLyric = findLyricById(lyric.ReferenceLyricId.Value);
+                    lyric.ReferenceLyric = findLyricById(lyric.ReferenceLyricId);
                     break;
 
                 default:
@@ -84,19 +79,16 @@ private void applyInvalidProperty(Note note, NoteWorkingProperty flag)
                     break;
 
                 case NoteWorkingProperty.ReferenceLyric:
-                    if (note.ReferenceLyric != null || note.ReferenceLyricId == null)
-                        return;
-
-                    note.ReferenceLyric = findLyricById(note.ReferenceLyricId.Value);
+                    note.ReferenceLyric = findLyricById(note.ReferenceLyricId);
                     break;
 
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        private Lyric findLyricById(int id) =>
-            Beatmap.HitObjects.OfType<Lyric>().Single(x => x.ID == id);
+        private Lyric? findLyricById(int? id) =>
+            id == null ? null : Beatmap.HitObjects.OfType<Lyric>().Single(x => x.ID == id);
 
         public override void PostProcess()
         {