mirror of
https://github.com/ppy/osu.git
synced 2024-11-11 22:27:25 +08:00
Fix post-merge errors.
This commit is contained in:
parent
ce1257ba56
commit
79fa9daec8
@ -23,7 +23,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
|
||||
/// </summary>
|
||||
private int userHits;
|
||||
|
||||
private Bash bash;
|
||||
private readonly Bash bash;
|
||||
|
||||
public DrawableBash(Bash bash)
|
||||
: base(bash)
|
||||
@ -61,6 +61,10 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
|
||||
}
|
||||
}
|
||||
|
||||
protected override void UpdateState(ArmedState state)
|
||||
{
|
||||
}
|
||||
|
||||
protected override void UpdateScrollPosition(double time)
|
||||
{
|
||||
base.UpdateScrollPosition(Math.Min(time, HitObject.StartTime));
|
||||
|
Loading…
Reference in New Issue
Block a user