sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix newly found inspections from 2021.1EAP1

Browse Source
This commit is contained in:
Dean Herbert
2021-06-01 14:33:21 +09:00
parent 2d530256f5
commit 6ef9b346e1
6 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
View File

@ -141,14 +141,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
private Room createRoom(Action<Room> initFunc = null) private Room createRoom(Action<Room> initFunc = null)
{ {
var room = new Room(); var room = new Room
room.Name.Value = "test room";
room.Playlist.Add(new PlaylistItem
{ {
Beatmap = { Value = new TestBeatmap(Ruleset.Value).BeatmapInfo }, Name =
Ruleset = { Value = Ruleset.Value } {
}); Value = "test room"
},
Playlist =
{
new PlaylistItem
{
Beatmap = { Value = new TestBeatmap(Ruleset.Value).BeatmapInfo },
Ruleset = { Value = Ruleset.Value }
}
}
};
initFunc?.Invoke(room); initFunc?.Invoke(room);
return room; return room;

11
osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
View File

@ -17,11 +17,12 @@ namespace osu.Game.Tournament.Tests.Screens
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
var match = new TournamentMatch(); ladder.CurrentMatch.Value = new TournamentMatch
match.Team1.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "USA"); {
match.Team2.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "JPN"); Team1 = { Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "USA") },
match.Round.Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals"); Team2 = { Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "JPN") },
ladder.CurrentMatch.Value = match; Round = { Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals") }
};
Add(new TeamIntroScreen Add(new TeamIntroScreen
{ {

8
osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
View File

@ -39,7 +39,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
public event Action<SelectionState> StateChanged; public event Action<SelectionState> StateChanged;
private readonly Box selectionBox; private readonly Box selectionBox;
private CachedModelDependencyContainer<Room> dependencies;
[Resolved(canBeNull: true)] [Resolved(canBeNull: true)]
private OnlinePlayScreen parentScreen { get; set; } private OnlinePlayScreen parentScreen { get; set; }
@ -209,9 +208,10 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{ {
dependencies = new CachedModelDependencyContainer<Room>(base.CreateChildDependencies(parent)); return new CachedModelDependencyContainer<Room>(base.CreateChildDependencies(parent))
dependencies.Model.Value = Room; {
return dependencies; Model = { Value = Room }
};
} }
protected override void LoadComplete() protected override void LoadComplete()

12
osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
View File

@ -54,12 +54,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value}, selection: {multiplayerRoomManager.TimeBetweenSelectionPolls.Value})"); Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value}, selection: {multiplayerRoomManager.TimeBetweenSelectionPolls.Value})");
} }
protected override Room CreateNewRoom() protected override Room CreateNewRoom() =>
{ new Room
var room = new Room { Name = { Value = $"{API.LocalUser}'s awesome room" } }; {
room.Category.Value = RoomCategory.Realtime; Name = { Value = $"{API.LocalUser}'s awesome room" },
return room; Category = { Value = RoomCategory.Realtime }
} };
protected override string ScreenTitle => "Multiplayer"; protected override string ScreenTitle => "Multiplayer";

18
osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
View File

@ -96,15 +96,19 @@ namespace osu.Game.Screens.OnlinePlay
{ {
itemSelected = true; itemSelected = true;
var item = new PlaylistItem(); var item = new PlaylistItem
{
Beatmap =
{
Value = Beatmap.Value.BeatmapInfo
},
Ruleset =
{
Value = Ruleset.Value
}
};
item.Beatmap.Value = Beatmap.Value.BeatmapInfo;
item.Ruleset.Value = Ruleset.Value;
item.RequiredMods.Clear();
item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy())); item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
item.AllowedMods.Clear();
item.AllowedMods.AddRange(FreeMods.Value.Select(m => m.CreateCopy())); item.AllowedMods.AddRange(FreeMods.Value.Select(m => m.CreateCopy()));
SelectItem(item); SelectItem(item);

12
osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs
View File

@ -31,12 +31,16 @@ namespace osu.Game.Tests.Beatmaps
using (var stream = new LineBufferedReader(resStream)) using (var stream = new LineBufferedReader(resStream))
{ {
var decoder = Decoder.GetDecoder<Beatmap>(stream); var decoder = Decoder.GetDecoder<Beatmap>(stream);
((LegacyBeatmapDecoder)decoder).ApplyOffsets = false; ((LegacyBeatmapDecoder)decoder).ApplyOffsets = false;
var working = new TestWorkingBeatmap(decoder.Decode(stream)); return new TestWorkingBeatmap(decoder.Decode(stream))
working.BeatmapInfo.Ruleset = CreateRuleset().RulesetInfo; {
BeatmapInfo =
return working; {
Ruleset = CreateRuleset().RulesetInfo
}
};
} }
} }