Fix storyboard incorrectly re-ordering elements (ppy#7302)

Fix storyboard incorrectly re-ordering elements
OliBomby · Dec 20, 2019 · ce41be5 · ce41be5
2 parents 95b086f + 705cdde
commit ce41be5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -71,7 +71,7 @@ public void TestDecodeStoryboardEvents()
                 Assert.AreEqual(new Vector2(320, 240), sprite.InitialPosition);
                 Assert.IsTrue(sprite.IsDrawable);
                 Assert.AreEqual(Anchor.Centre, sprite.Origin);
-                Assert.AreEqual("SB/black.jpg", sprite.Path);
+                Assert.AreEqual("SB/lyric/ja-21.png", sprite.Path);
 
                 var animation = background.Elements.OfType<StoryboardAnimation>().First();
                 Assert.NotNull(animation);

diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Extensions;
@@ -42,10 +41,6 @@ protected override void ParseStreamInto(LineBufferedReader stream, Storyboard st
         {
             this.storyboard = storyboard;
             base.ParseStreamInto(stream, storyboard);
-
-            // OrderBy is used to guarantee that the parsing order of elements with equal start times is maintained (stably-sorted)
-            foreach (StoryboardLayer layer in storyboard.Layers)
-                layer.Elements = layer.Elements.OrderBy(h => h.StartTime).ToList();
         }
 
         protected override void ParseLine(Storyboard storyboard, Section section, string line)