Merge pull request #371 from taulazer/dependabot/nuget/ppy.osu.Game-2…

…023.510.0 Bump ppy.osu.Game from 2023.419.0 to 2023.510.0
taulazer · May 11, 2023 · 3276b1e · 3276b1e
2 parents d40c1b0 + 2a5734b
commit 3276b1e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/osu.Game.Rulesets.Tau.Tests/osu.Game.Rulesets.Tau.Tests.csproj b/osu.Game.Rulesets.Tau.Tests/osu.Game.Rulesets.Tau.Tests.csproj
@@ -15,7 +15,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
         <PackageReference Include="NUnit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-        <PackageReference Include="ppy.osu.Game" Version="2023.419.0" />
+        <PackageReference Include="ppy.osu.Game" Version="2023.510.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\osu.Game.Rulesets.Tau\osu.Game.Rulesets.Tau.csproj" />

diff --git a/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableSlider.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -110,7 +109,6 @@ protected override void AddNestedHitObject(DrawableHitObject hitObject)
                     headContainer.Child = head;
                     break;
 
-
                 case DrawableSliderRepeat repeat:
                     repeatContainer.Add(repeat);
                     break;
@@ -184,14 +182,8 @@ protected override void LoadSamples()
         {
             // Note: base.LoadSamples() isn't called since the slider plays the tail's hitsounds for the time being.
 
-            if (HitObject.SampleControlPoint == null)
-            {
-                throw new InvalidOperationException($"{nameof(HitObject)}s must always have an attached {nameof(HitObject.SampleControlPoint)}." +
-                                                    $" This is an indication that {nameof(HitObject.ApplyDefaults)} has not been invoked on {this}.");
-            }
-
-            Samples.Samples = HitObject.TailSamples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)).Cast<ISampleInfo>().ToArray();
-            slidingSample.Samples = HitObject.CreateSlidingSamples().Select(s => HitObject.SampleControlPoint.ApplyTo(s)).Cast<ISampleInfo>().ToArray();
+            Samples.Samples = HitObject.TailSamples.Cast<ISampleInfo>().ToArray();
+            slidingSample.Samples = HitObject.CreateSlidingSamples().Cast<ISampleInfo>().ToArray();
         }
 
         public override void StopAllSamples()

diff --git a/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj b/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj
@@ -39,7 +39,7 @@
     <None Remove="Resources\Shaders\sh_DepthMask.vs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2023.419.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2023.510.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Objects\Drawables\DrawableSlider.Calculations.cs">