diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
index f1c0afc675..a62e0260bd 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
@@ -29,19 +29,5 @@ namespace osu.Game.Rulesets.Taiko.Objects
/// Strong hit objects give more points for hitting the hit object with both keys.
///
public bool IsStrong;
-
- ///
- /// Whether this HitObject is in Kiai time.
- ///
- public bool Kiai { get; protected set; }
-
- public override void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
- {
- base.ApplyDefaults(controlPointInfo, difficulty);
-
- EffectControlPoint effectPoint = controlPointInfo.EffectPointAt(StartTime);
-
- Kiai |= effectPoint.KiaiMode;
- }
}
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index c343cdaf33..c69979d4cf 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -30,6 +30,11 @@ namespace osu.Game.Rulesets.Objects
///
public SampleInfoList Samples = new SampleInfoList();
+ ///
+ /// Whether this is in Kiai time.
+ ///
+ public bool Kiai { get; private set; }
+
///
/// Applies default values to this HitObject.
///
@@ -38,6 +43,9 @@ namespace osu.Game.Rulesets.Objects
public virtual void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
{
SoundControlPoint soundPoint = controlPointInfo.SoundPointAt(StartTime);
+ EffectControlPoint effectPoint = controlPointInfo.EffectPointAt(StartTime);
+
+ Kiai |= effectPoint.KiaiMode;
// Initialize first sample
Samples.ForEach(s => initializeSampleInfo(s, soundPoint));