From bc3f11fdb87983e0faeab1acd96aa2e526f89f52 Mon Sep 17 00:00:00 2001
From: FreezyLemon <freezestyleman@gmx.de>
Date: Wed, 29 Nov 2017 06:24:13 +0100
Subject: [PATCH] Added PlaysSamples property to prevent certain
 DrawableHitObjects from playing their samples on hit. Also added this to
 TaikoObjects so their hitsounds won't be played (will be done by the
 TaikoRulesetContainer)

---
 .../Objects/Drawables/DrawableTaikoHitObject.cs              | 2 ++
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs     | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 7976cbbbc1..8ebfaaea38 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     {
         public override Vector2 OriginPosition => new Vector2(DrawHeight / 2);
 
+        protected override bool PlaysSamples => false;
+
         protected readonly Vector2 BaseSize;
 
         protected readonly TaikoPiece MainPiece;
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 941cedca3f..12f4fc4f31 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -59,6 +59,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         private readonly List<Judgement> judgements = new List<Judgement>();
         public IReadOnlyList<Judgement> Judgements => judgements;
 
+        // Override in inheriting classes to prevent from playing samples on hit
+        protected virtual bool PlaysSamples => true;
+
         protected List<SampleChannel> Samples = new List<SampleChannel>();
 
         public readonly Bindable<ArmedState> State = new Bindable<ArmedState>();
@@ -92,7 +95,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             {
                 UpdateState(state);
 
-                if (State == ArmedState.Hit)
+                if (State == ArmedState.Hit && PlaysSamples)
                     PlaySamples();
             };