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

Merge branch 'master' into fix-android-builds

Browse Source
This commit is contained in:
Dean Herbert 2021-11-11 19:04:03 +09:00 committed by GitHub
commit 4a7bdee833
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Rulesets/RulesetLoadException.cs Normal file
View File

@ -0,0 +1,15 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
namespace osu.Game.Rulesets
{
public class RulesetLoadException : Exception
{
public RulesetLoadException(string message)
: base(@$"Ruleset could not be loaded ({message})")
{
}
}
}

8
osu.Game/Rulesets/RulesetStore.cs
View File

@ -7,7 +7,6 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using osu.Framework; using osu.Framework;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Game.Database; using osu.Game.Database;
@ -129,12 +128,15 @@ namespace osu.Game.Rulesets
{ {
try try
{ {
var instanceInfo = ((Ruleset)Activator.CreateInstance(Type.GetType(r.InstantiationInfo).AsNonNull())).RulesetInfo; var resolvedType = Type.GetType(r.InstantiationInfo)
?? throw new RulesetLoadException(@"Type could not be resolved");
var instanceInfo = (Activator.CreateInstance(resolvedType) as Ruleset)?.RulesetInfo
?? throw new RulesetLoadException(@"Instantiation failure");
r.Name = instanceInfo.Name; r.Name = instanceInfo.Name;
r.ShortName = instanceInfo.ShortName; r.ShortName = instanceInfo.ShortName;
r.InstantiationInfo = instanceInfo.InstantiationInfo; r.InstantiationInfo = instanceInfo.InstantiationInfo;
r.Available = true; r.Available = true;
} }
catch catch

18
osu.Game/Stores/RealmRulesetStore.cs
View File

@ -147,19 +147,15 @@ namespace osu.Game.Stores
{ {
try try
{ {
var type = Type.GetType(r.InstantiationInfo); var resolvedType = Type.GetType(r.InstantiationInfo)
?? throw new RulesetLoadException(@"Type could not be resolved");
if (type == null) var instanceInfo = (Activator.CreateInstance(resolvedType) as Ruleset)?.RulesetInfo
throw new InvalidOperationException(@"Type resolution failure."); ?? throw new RulesetLoadException(@"Instantiation failure");
var rInstance = (Activator.CreateInstance(type) as Ruleset)?.RulesetInfo; r.Name = instanceInfo.Name;
r.ShortName = instanceInfo.ShortName;
if (rInstance == null) r.InstantiationInfo = instanceInfo.InstantiationInfo;
throw new InvalidOperationException(@"Instantiation failure.");
r.Name = rInstance.Name;
r.ShortName = rInstance.ShortName;
r.InstantiationInfo = rInstance.InstantiationInfo;
r.Available = true; r.Available = true;
detachedRulesets.Add(r.Clone()); detachedRulesets.Add(r.Clone());