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

Merge pull request #6560 from peppy/dho-ho-not-null

Browse Source 
Ensure DrawableHitObject's HitObject is not null
This commit is contained in:
Dan Balasescu 2019-10-21 18:42:17 +09:00 committed by GitHub
commit 8210759039
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs
View File

@ -239,7 +239,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
private class TestStrongNestedHit : DrawableStrongNestedHit private class TestStrongNestedHit : DrawableStrongNestedHit
{ {
public TestStrongNestedHit(DrawableHitObject mainObject) public TestStrongNestedHit(DrawableHitObject mainObject)
: base(null, mainObject) : base(new StrongHitObject { StartTime = mainObject.HitObject.StartTime }, mainObject)
{ {
} }

5
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using JetBrains.Annotations;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions.TypeExtensions; using osu.Framework.Extensions.TypeExtensions;
@ -89,9 +90,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
public IBindable<ArmedState> State => state; public IBindable<ArmedState> State => state;
protected DrawableHitObject(HitObject hitObject) protected DrawableHitObject([NotNull] HitObject hitObject)
{ {
HitObject = hitObject; HitObject = hitObject ?? throw new ArgumentNullException(nameof(hitObject));
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]