mirror of
https://github.com/ppy/osu.git
synced 2025-01-28 09:02:58 +08:00
Fix crash due to unsafe mod deserialisation
This commit is contained in:
parent
a4254802c1
commit
bd1f38cc3e
@ -49,9 +49,32 @@ namespace osu.Game.Tests.Online
|
|||||||
Assert.That(converted.TestSetting.Value, Is.EqualTo(2));
|
Assert.That(converted.TestSetting.Value, Is.EqualTo(2));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestDeserialiseTimeRampMod()
|
||||||
|
{
|
||||||
|
// Create the mod with values different from default.
|
||||||
|
var apiMod = new APIMod(new TestModTimeRamp
|
||||||
|
{
|
||||||
|
AdjustPitch = { Value = false },
|
||||||
|
InitialRate = { Value = 1.25 },
|
||||||
|
FinalRate = { Value = 0.25 }
|
||||||
|
});
|
||||||
|
|
||||||
|
var deserialised = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
|
||||||
|
var converted = (TestModTimeRamp)deserialised.ToMod(new TestRuleset());
|
||||||
|
|
||||||
|
Assert.That(converted.AdjustPitch.Value, Is.EqualTo(false));
|
||||||
|
Assert.That(converted.InitialRate.Value, Is.EqualTo(1.25));
|
||||||
|
Assert.That(converted.FinalRate.Value, Is.EqualTo(0.25));
|
||||||
|
}
|
||||||
|
|
||||||
private class TestRuleset : Ruleset
|
private class TestRuleset : Ruleset
|
||||||
{
|
{
|
||||||
public override IEnumerable<Mod> GetModsFor(ModType type) => new[] { new TestMod() };
|
public override IEnumerable<Mod> GetModsFor(ModType type) => new Mod[]
|
||||||
|
{
|
||||||
|
new TestMod(),
|
||||||
|
new TestModTimeRamp(),
|
||||||
|
};
|
||||||
|
|
||||||
public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => throw new System.NotImplementedException();
|
public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => throw new System.NotImplementedException();
|
||||||
|
|
||||||
@ -78,5 +101,39 @@ namespace osu.Game.Tests.Online
|
|||||||
Precision = 0.01,
|
Precision = 0.01,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private class TestModTimeRamp : ModTimeRamp
|
||||||
|
{
|
||||||
|
public override string Name => "Test Mod";
|
||||||
|
public override string Acronym => "TMTR";
|
||||||
|
public override double ScoreMultiplier => 1;
|
||||||
|
|
||||||
|
[SettingSource("Initial rate", "The starting speed of the track")]
|
||||||
|
public override BindableNumber<double> InitialRate { get; } = new BindableDouble
|
||||||
|
{
|
||||||
|
MinValue = 1,
|
||||||
|
MaxValue = 2,
|
||||||
|
Default = 1.5,
|
||||||
|
Value = 1.5,
|
||||||
|
Precision = 0.01,
|
||||||
|
};
|
||||||
|
|
||||||
|
[SettingSource("Final rate", "The speed increase to ramp towards")]
|
||||||
|
public override BindableNumber<double> FinalRate { get; } = new BindableDouble
|
||||||
|
{
|
||||||
|
MinValue = 0,
|
||||||
|
MaxValue = 1,
|
||||||
|
Default = 0.5,
|
||||||
|
Value = 0.5,
|
||||||
|
Precision = 0.01,
|
||||||
|
};
|
||||||
|
|
||||||
|
[SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
|
||||||
|
public override BindableBool AdjustPitch { get; } = new BindableBool
|
||||||
|
{
|
||||||
|
Default = true,
|
||||||
|
Value = true
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -89,9 +89,9 @@ namespace osu.Game.Rulesets.Mods
|
|||||||
private void applyPitchAdjustment(ValueChangedEvent<bool> adjustPitchSetting)
|
private void applyPitchAdjustment(ValueChangedEvent<bool> adjustPitchSetting)
|
||||||
{
|
{
|
||||||
// remove existing old adjustment
|
// remove existing old adjustment
|
||||||
track.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
|
track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
|
||||||
|
|
||||||
track.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
|
track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
|
||||||
}
|
}
|
||||||
|
|
||||||
private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
|
private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
|
||||||
|
Loading…
Reference in New Issue
Block a user