sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 09:27:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14096 from frenzibyte/processors-on-load-complete

Browse Source 
Fix judgement processors provided to mods while not completely loaded
This commit is contained in:
Dan Balasescu 2021-08-02 10:31:48 +09:00 committed by GitHub
commit cf30f02f02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Rulesets/Mods/IApplicableToHealthProcessor.cs
View File

@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Mods
public interface IApplicableToHealthProcessor : IApplicableMod public interface IApplicableToHealthProcessor : IApplicableMod
{ {
/// <summary> /// <summary>
/// Provide a <see cref="HealthProcessor"/> to a mod. Called once on initialisation of a play instance. /// Provides a loaded <see cref="HealthProcessor"/> to a mod. Called once on initialisation of a play instance.
/// </summary> /// </summary>
void ApplyToHealthProcessor(HealthProcessor healthProcessor); void ApplyToHealthProcessor(HealthProcessor healthProcessor);
} }

2
osu.Game/Rulesets/Mods/IApplicableToScoreProcessor.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
public interface IApplicableToScoreProcessor : IApplicableMod public interface IApplicableToScoreProcessor : IApplicableMod
{ {
/// <summary> /// <summary>
/// Provide a <see cref="ScoreProcessor"/> to a mod. Called once on initialisation of a play instance. /// Provides a loaded <see cref="ScoreProcessor"/> to a mod. Called once on initialisation of a play instance.
/// </summary> /// </summary>
void ApplyToScoreProcessor(ScoreProcessor scoreProcessor); void ApplyToScoreProcessor(ScoreProcessor scoreProcessor);

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

@ -297,11 +297,19 @@ namespace osu.Game.Screens.Play
ScoreProcessor.HasCompleted.BindValueChanged(scoreCompletionChanged); ScoreProcessor.HasCompleted.BindValueChanged(scoreCompletionChanged);
HealthProcessor.Failed += onFail; HealthProcessor.Failed += onFail;
foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>()) // Provide judgement processors to mods after they're loaded so that they're on the gameplay clock,
mod.ApplyToScoreProcessor(ScoreProcessor); // this is required for mods that apply transforms to these processors.
ScoreProcessor.OnLoadComplete += _ =>
{
foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
mod.ApplyToScoreProcessor(ScoreProcessor);
};
foreach (var mod in Mods.Value.OfType<IApplicableToHealthProcessor>()) HealthProcessor.OnLoadComplete += _ =>
mod.ApplyToHealthProcessor(HealthProcessor); {
foreach (var mod in Mods.Value.OfType<IApplicableToHealthProcessor>())
mod.ApplyToHealthProcessor(HealthProcessor);
};
IsBreakTime.BindTo(breakTracker.IsBreakTime); IsBreakTime.BindTo(breakTracker.IsBreakTime);
IsBreakTime.BindValueChanged(onBreakTimeChanged, true); IsBreakTime.BindValueChanged(onBreakTimeChanged, true);