sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Moved the logic to the bottom as placeCaughtObject is otherwise not called yet

Browse Source
This commit is contained in:
Darius Wattimena
2021-11-18 20:24:40 +01:00
parent 9685892b94
commit 38edeac710
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Rulesets.Catch/UI/Catcher.cs
View File

@ -213,14 +213,6 @@ namespace osu.Game.Rulesets.Catch.UI
// Ignore JuiceStreams and BananaShowers // Ignore JuiceStreams and BananaShowers
if (!(drawableObject is DrawablePalpableCatchHitObject palpableObject)) return; if (!(drawableObject is DrawablePalpableCatchHitObject palpableObject)) return;
if (palpableObject.HitObject.LastInCombo)
{
if (result.Judgement is CatchJudgement catchJudgement && catchJudgement.ShouldExplodeFor(result))
Explode();
else
Drop();
}
var hitObject = palpableObject.HitObject; var hitObject = palpableObject.HitObject;
if (result.IsHit) if (result.IsHit)
@ -253,6 +245,14 @@ namespace osu.Game.Rulesets.Catch.UI
CurrentState = hitObject.Kiai ? CatcherAnimationState.Kiai : CatcherAnimationState.Idle; CurrentState = hitObject.Kiai ? CatcherAnimationState.Kiai : CatcherAnimationState.Idle;
else if (!(hitObject is Banana)) else if (!(hitObject is Banana))
CurrentState = CatcherAnimationState.Fail; CurrentState = CatcherAnimationState.Fail;
if (palpableObject.HitObject.LastInCombo)
{
if (result.Judgement is CatchJudgement catchJudgement && catchJudgement.ShouldExplodeFor(result))
Explode();
else
Drop();
}
} }
public void OnRevertResult(DrawableCatchHitObject drawableObject, JudgementResult result) public void OnRevertResult(DrawableCatchHitObject drawableObject, JudgementResult result)