Skip to content

Commit 946321f

Browse files
committed
Fix heart collect logic
1 parent 9080f55 commit 946321f

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

osu.Game.Rulesets.Rush/Objects/Drawables/DrawableHeart.cs

+7-6
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,20 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
4141

4242
var result = HitObject.HitWindows.ResultFor(timeOffset);
4343

44-
// if we've manually hit it, assume it's ok
45-
if (userTriggered && result != HitResult.None)
44+
if (userTriggered)
4645
{
47-
ApplyResult(r => r.Type = HitResult.Perfect);
46+
if (result != HitResult.None)
47+
ApplyResult(r => r.Type = HitResult.Perfect);
48+
4849
return;
4950
}
5051

51-
// if we haven't reached the perfect range, do nothing
52-
if (timeOffset < 0 && result != HitResult.Perfect)
52+
// if we haven't passed the hitobject time, do nothing
53+
if (timeOffset < 0)
5354
return;
5455

5556
// if we've passed the object and can longer hit it, miss
56-
if (timeOffset >= 0 && !HitObject.HitWindows.CanBeHit(timeOffset))
57+
if (result == HitResult.None)
5758
ApplyResult(r => r.Type = HitResult.Miss);
5859

5960
// else if we're still able to hit it, check if the player is in the correct lane

0 commit comments

Comments
 (0)