From e3afa9bf715603a6ecd5f8e5decf82ea2507eab0 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Fri, 17 Mar 2017 19:25:55 +0900
Subject: [PATCH] Fix post-merge errors.

---
 osu.Game.Modes.Taiko/Objects/Drawable/DrawableBash.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableBash.cs b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableBash.cs
index 4e848c76c3..00abd3017d 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableBash.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableBash.cs
@@ -10,7 +10,7 @@ using System;
 
 namespace osu.Game.Modes.Taiko.Objects.Drawable
 {
-    public class DrawableBash : DrawableTaikoHitObject<Bash>
+    public class DrawableBash : DrawableTaikoHitObject
     {
         /// <summary>
         /// A list of keys which this HitObject will accept. These are the standard Taiko keys for now.
@@ -23,9 +23,12 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
         /// </summary>
         private int userHits;
 
+        private Bash bash;
+
         public DrawableBash(Bash bash)
             : base(bash)
         {
+            this.bash = bash;
         }
 
         protected override void CheckJudgement(bool userTriggered)
@@ -37,7 +40,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
 
                 userHits++;
 
-                if (userHits == HitObject.RequiredHits)
+                if (userHits == bash.RequiredHits)
                 {
                     Judgement.Result = HitResult.Hit;
                     Judgement.Score = TaikoScoreResult.Great;
@@ -48,7 +51,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
                 if (Judgement.TimeOffset < 0)
                     return;
 
-                if (userHits > HitObject.RequiredHits / 2)
+                if (userHits > bash.RequiredHits / 2)
                 {
                     Judgement.Result = HitResult.Hit;
                     Judgement.Score = TaikoScoreResult.Good;