From 519ef72adfa3b44d4a5fe28e904beb2fcd2c8c93 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Dec 2017 13:03:46 +0900
Subject: [PATCH] Lookup by control point time rather than control point

Under some situations, such as when there are no control points, ControlPointInfo will return to us a newly-constructed controlpoint with every call to SamplePointAt, which will fail on this key lookup.

Between this and overriding GetHashCode, I think this is the more proper fix for this.
---
 osu.Game.Rulesets.Taiko/Audio/DrumSampleMapping.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Audio/DrumSampleMapping.cs b/osu.Game.Rulesets.Taiko/Audio/DrumSampleMapping.cs
index 74e2195e09..982b339d3a 100644
--- a/osu.Game.Rulesets.Taiko/Audio/DrumSampleMapping.cs
+++ b/osu.Game.Rulesets.Taiko/Audio/DrumSampleMapping.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Game.Audio;
@@ -13,7 +12,7 @@ namespace osu.Game.Rulesets.Taiko.Audio
     public class DrumSampleMapping
     {
         private readonly ControlPointInfo controlPoints;
-        private readonly Dictionary<SampleControlPoint, DrumSample> mappings = new Dictionary<SampleControlPoint, DrumSample>();
+        private readonly Dictionary<double, DrumSample> mappings = new Dictionary<double, DrumSample>();
 
         public DrumSampleMapping(ControlPointInfo controlPoints, AudioManager audio)
         {
@@ -26,9 +25,9 @@ namespace osu.Game.Rulesets.Taiko.Audio
             else
                 samplePoints = controlPoints.SamplePoints;
 
-            foreach (var s in samplePoints.Distinct())
+            foreach (var s in samplePoints)
             {
-                mappings[s] = new DrumSample
+                mappings[s.Time] = new DrumSample
                 {
                     Centre = s.GetSampleInfo().GetChannel(audio.Sample, "Taiko"),
                     Rim = s.GetSampleInfo(SampleInfo.HIT_CLAP).GetChannel(audio.Sample, "Taiko")
@@ -36,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Audio
             }
         }
 
-        public DrumSample SampleAt(double time) => mappings[controlPoints.SamplePointAt(time)];
+        public DrumSample SampleAt(double time) => mappings[controlPoints.SamplePointAt(time).Time];
 
         public class DrumSample
         {