h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00
Code Issues Releases Wiki Activity

further simplification

Browse Source
This commit is contained in:
Terochi 2023-04-26 10:46:29 +02:00
parent 27f81288ef
commit 332c199dc2
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Rulesets/Mods/Mod.cs
View File

@ -5,7 +5,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using AutoMapper.Internal;
using Newtonsoft.Json;
using osu.Framework.Bindables;
using osu.Framework.Extensions.TypeExtensions;
@ -182,7 +181,10 @@ namespace osu.Game.Rulesets.Mods
if (sourceSetting.IsDefault)
continue;
if (getBindableGenericType(targetSetting) != getBindableGenericType(sourceSetting))
var targetType = targetSetting.GetType();
var sourceType = sourceSetting.GetType();
if (!targetType.IsAssignableFrom(sourceType) && !sourceType.IsAssignableFrom(targetType))
continue;
// TODO: special case for handling number types
@ -190,11 +192,6 @@ namespace osu.Game.Rulesets.Mods
PropertyInfo property = targetSetting.GetType().GetProperty(nameof(Bindable<bool>.Value))!;
property.SetValue(targetSetting, property.GetValue(sourceSetting));
}
Type getBindableGenericType(IBindable setting) =>
setting.GetType().GetTypeInheritance()
.First(t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Bindable<>))
.GenericTypeArguments.Single();
}
/// <summary>