diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs index 8625b93786..672ff2cb3a 100644 --- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs +++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs @@ -16,10 +16,10 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable private Color4? colour; - protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList comboColours) + protected override Color4 GetComboColour(IReadOnlyList comboColours) { // override any external colour changes with banananana - AccentColour.Value = (colour ??= getBananaColour()); + return colour ??= getBananaColour(); } private Color4 getBananaColour() diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs index 188de6a6ae..3293f41eab 100644 --- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs +++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs @@ -45,11 +45,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable ScaleContainer.Scale = new Vector2(HitObject.Scale); } - protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList comboColours) - { - // ignore the incoming combo colour as we use a custom lookup - AccentColour.Value = comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count]; - } + protected override Color4 GetComboColour(IReadOnlyList comboColours) => + comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count]; } public abstract class DrawableCatchHitObject : DrawableCatchHitObject