h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 11:43:21 +08:00
Code Issues Releases Wiki Activity

remove from rulesetinfo

Browse Source
This commit is contained in:
Albie Spriddell 2020-01-03 13:08:01 +00:00
parent 5940851519
commit 71a3db7cd6
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Rulesets/Ruleset.cs
View File

@ -59,7 +59,6 @@ namespace osu.Game.Rulesets
ID = (this as ILegacyRuleset)?.LegacyID, ID = (this as ILegacyRuleset)?.LegacyID,
InstantiationInfo = GetType().AssemblyQualifiedName, InstantiationInfo = GetType().AssemblyQualifiedName,
Available = true, Available = true,
PlayingVerb = PlayingVerb,
}; };
} }

4
osu.Game/Rulesets/RulesetInfo.cs
View File

@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System; using System;
using System.ComponentModel.DataAnnotations.Schema;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using Newtonsoft.Json; using Newtonsoft.Json;
@ -18,9 +17,6 @@ namespace osu.Game.Rulesets
public string InstantiationInfo { get; set; } public string InstantiationInfo { get; set; }
[NotMapped]
public string PlayingVerb { get; set; }
[JsonIgnore] [JsonIgnore]
public bool Available { get; set; } public bool Available { get; set; }

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

@ -92,7 +92,6 @@ namespace osu.Game.Rulesets
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.PlayingVerb = instanceInfo.PlayingVerb;
r.Available = true; r.Available = true;
} }

2
osu.Game/Users/UserActivity.cs
View File

@ -52,7 +52,7 @@ namespace osu.Game.Users
Ruleset = ruleset; Ruleset = ruleset;
} }
public override string Status => Ruleset.PlayingVerb; public override string Status => Beatmap.Ruleset.CreateInstance().PlayingVerb;
} }
public class Spectating : UserActivity public class Spectating : UserActivity