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

Merge pull request #13615 from peppy/mod-utils-check-duplicate-mods

Browse Source 
Ensure duplicate mods cannot be defined
This commit is contained in:
Dan Balasescu 2021-06-22 20:28:40 +09:00 committed by GitHub
commit c436f9f0fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Tests/Mods/ModUtilsTest.cs
View File

@ -14,6 +14,14 @@ namespace osu.Game.Tests.Mods
[TestFixture] [TestFixture]
public class ModUtilsTest public class ModUtilsTest
{ {
[Test]
public void TestModIsNotCompatibleWithItself()
{
var mod = new Mock<CustomMod1>();
Assert.That(ModUtils.CheckCompatibleSet(new[] { mod.Object, mod.Object }, out var invalid), Is.False);
Assert.That(invalid, Is.EquivalentTo(new[] { mod.Object }));
}
[Test] [Test]
public void TestModIsCompatibleByItself() public void TestModIsCompatibleByItself()
{ {
@ -147,7 +155,7 @@ namespace osu.Game.Tests.Mods
// multi mod. // multi mod.
new object[] new object[]
{ {
new Mod[] { new MultiMod(new OsuModHalfTime()), new OsuModHalfTime() }, new Mod[] { new MultiMod(new OsuModHalfTime()), new OsuModDaycore() },
new[] { typeof(MultiMod) } new[] { typeof(MultiMod) }
}, },
// valid pair. // valid pair.

23
osu.Game/Utils/ModUtils.cs
View File

@ -51,14 +51,31 @@ namespace osu.Game.Utils
/// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns> /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
public static bool CheckCompatibleSet(IEnumerable<Mod> combination, [NotNullWhen(false)] out List<Mod>? invalidMods) public static bool CheckCompatibleSet(IEnumerable<Mod> combination, [NotNullWhen(false)] out List<Mod>? invalidMods)
{ {
combination = FlattenMods(combination).ToArray(); var mods = FlattenMods(combination).ToArray();
invalidMods = null; invalidMods = null;
foreach (var mod in combination) // ensure there are no duplicate mod definitions.
for (int i = 0; i < mods.Length; i++)
{
var candidate = mods[i];
for (int j = i + 1; j < mods.Length; j++)
{
var m = mods[j];
if (candidate.Equals(m))
{
invalidMods ??= new List<Mod>();
invalidMods.Add(m);
}
}
}
foreach (var mod in mods)
{ {
foreach (var type in mod.IncompatibleMods) foreach (var type in mod.IncompatibleMods)
{ {
foreach (var invalid in combination.Where(m => type.IsInstanceOfType(m))) foreach (var invalid in mods.Where(m => type.IsInstanceOfType(m)))
{ {
if (invalid == mod) if (invalid == mod)
continue; continue;