From 77041bdbb571a738da0c22f10948059642502bb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 May 2020 16:19:47 +0900
Subject: [PATCH] Move implementation to DrawableHit to avoid "breaking" legacy
 encoding

---
 .../Beatmaps/TaikoBeatmapConverter.cs         | 24 -----------------
 .../Objects/Drawables/DrawableHit.cs          | 27 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 822931396a..d324441285 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -171,30 +171,6 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
                     bool isRim = samples.Any(isRimDefinition);
 
-                    if (isRim)
-                    {
-                        // consume then remove the rim definition sample types.
-                        var updatedSamples = samples.Where(s => !isRimDefinition(s)).ToList();
-
-                        // strong + rim always maps to whistle.
-                        if (strong)
-                        {
-                            for (var i = 0; i < updatedSamples.Count; i++)
-                            {
-                                var s = samples[i];
-
-                                if (s.Name != HitSampleInfo.HIT_FINISH)
-                                    continue;
-
-                                var sClone = s.Clone();
-                                sClone.Name = HitSampleInfo.HIT_WHISTLE;
-                                updatedSamples[i] = sClone;
-                            }
-                        }
-
-                        samples = updatedSamples;
-                    }
-
                     yield return new Hit
                     {
                         StartTime = obj.StartTime,
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index d4dc3316e7..d332f90cd4 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -52,7 +52,32 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override IEnumerable<HitSampleInfo> GetSamples()
         {
             // normal and claps are always handled by the drum (see DrumSampleMapping).
-            return HitObject.Samples.Where(s => s.Name != HitSampleInfo.HIT_NORMAL && s.Name != HitSampleInfo.HIT_CLAP);
+            var samples = HitObject.Samples.Where(s => s.Name != HitSampleInfo.HIT_NORMAL && s.Name != HitSampleInfo.HIT_CLAP);
+
+            if (HitObject.Type == HitType.Rim && HitObject.IsStrong)
+            {
+                // strong + rim always maps to whistle.
+                // TODO: this should really be in the legacy decoder, but can't be because legacy encoding parity would be broken.
+                // when we add a taiko editor, this is probably not going to play nice.
+
+                var corrected = samples.ToList();
+
+                for (var i = 0; i < corrected.Count; i++)
+                {
+                    var s = corrected[i];
+
+                    if (s.Name != HitSampleInfo.HIT_FINISH)
+                        continue;
+
+                    var sClone = s.Clone();
+                    sClone.Name = HitSampleInfo.HIT_WHISTLE;
+                    corrected[i] = sClone;
+                }
+
+                return corrected;
+            }
+
+            return samples;
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)