h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-24 05:13:13 +08:00
Code Issues Releases Wiki Activity

Pass already ordered mods to HealthProcessor

Browse Source
This commit is contained in:
Peter-io 2024-07-16 14:40:04 +02:00
parent 126a39b0f7
commit 54c12c281b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Rulesets/Scoring/HealthProcessor.cs
View File

@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Scoring
if (CheckDefaultFailCondition(result)) if (CheckDefaultFailCondition(result))
return true; return true;
foreach (var condition in Mods.Value.OfType<IHasFailCondition>().OrderByDescending(m => m.RestartOnFail)) foreach (var condition in Mods.Value.OfType<IHasFailCondition>())
{ {
if (condition.FailCondition(result)) if (condition.FailCondition(result))
{ {

2
osu.Game/Screens/Play/Player.cs
View File

@ -244,7 +244,7 @@ namespace osu.Game.Screens.Play
HealthProcessor = gameplayMods.OfType<IApplicableHealthProcessor>().FirstOrDefault()?.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime); HealthProcessor = gameplayMods.OfType<IApplicableHealthProcessor>().FirstOrDefault()?.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime);
HealthProcessor ??= ruleset.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime); HealthProcessor ??= ruleset.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime);
HealthProcessor.Mods.Value = gameplayMods; HealthProcessor.Mods.Value = gameplayMods.OrderByDescending(m => m is IHasFailCondition mod && mod.RestartOnFail).ToArray();
HealthProcessor.ApplyBeatmap(playableBeatmap); HealthProcessor.ApplyBeatmap(playableBeatmap);
dependencies.CacheAs(HealthProcessor); dependencies.CacheAs(HealthProcessor);